diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-09-05 14:19:49 +0700 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-09-09 14:34:36 +0700 |
| commit | ff8e2308930072457580e9fa097851a598999e59 (patch) | |
| tree | dc16ca117247ba64ac6b2734a6d15a9d5fd0f32e | |
| parent | 21a1b535c6ea20fc1cfac4e628e8b22d3a121151 (diff) | |
| download | gitlab-ce-ce-indicator-for-pipeline-for-merge-train-backup.tar.gz | |
Add feature spec and fix backend logicce-indicator-for-pipeline-for-merge-train-backup
This commit adds feature spec and fixes backend logic
| -rw-r--r-- | app/models/ci/pipeline.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index d2271c1335c..4aaabed6b7b 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -835,12 +835,12 @@ module Ci return unless merge_request_event? strong_memoize(:merge_request_event_type) do - if detached_merge_request_pipeline? - :detached + if merge_train_pipeline? + :merge_train elsif merge_request_pipeline? :merged_result - elsif merge_train_pipeline? - :merge_train + elsif detached_merge_request_pipeline? + :detached end end end |