Skip to content
Snippets Groups Projects

Show indicator to Pipelines for merge train

Merged Show indicator to Pipelines for merge train
indicator-for-pipeline-for-merge-train into master
All threads resolved!
Merged Shinya Maeda requested to merge indicator-for-pipeline-for-merge-train into master
All threads resolved!
Viewing commit ff361258
Show latest version
4 files
+ 80
− 9
Compare changes
  • Side-by-side
  • Inline
Files
4
  • ff361258 
    This change updates the text of the pipeline widget that appears on the
merge request page. The text has been made more consistent between
different types of pipelines; this makes the front-end implementation
simpler and more maintainable.  In addition, the type of pipeline is
(i.e. regular pipeline, merge request pipeline, detached pipeline)
included in the text, making this type more obvious to the end user.

Some information has been removed from the widget as part of this
change; however, any information that was removed already appears
elsewhere on the merge request page.
ee/spec/factories/merge_requests.rb
+ 9
− 0
@@ -24,6 +24,15 @@
end
end
trait :with_merge_train_pipeline do
with_merge_request_pipeline
after(:create) do |merge_request, evaluator|
merge_request.pipelines_for_merge_request.last
.update(ref: merge_request.train_ref_path)
end
end
trait :add_to_merge_train_when_pipeline_succeeds do
auto_merge_enabled true
auto_merge_strategy AutoMergeService::STRATEGY_ADD_TO_MERGE_TRAIN_WHEN_PIPELINE_SUCCEEDS