From ff8e2308930072457580e9fa097851a598999e59 Mon Sep 17 00:00:00 2001 From: Shinya Maeda Date: Thu, 5 Sep 2019 14:19:49 +0700 Subject: Add feature spec and fix backend logic This commit adds feature spec and fixes backend logic --- app/models/ci/pipeline.rb | 8 ++++---- 1 file 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 -- cgit v1.2.1