Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 3 deletions

diff --git a/app/services/merge_requests/refresh_service.rb b/app/services/merge_requests/refresh_service.rb
index b32499629ff..bd3fcf85a62 100644
--- a/app/services/merge_requests/refresh_service.rb
+++ b/app/services/merge_requests/refresh_service.rb
@@ -152,7 +152,8 @@ module MergeRequests
     def abort_ff_merge_requests_with_when_pipeline_succeeds
       return unless @project.ff_merge_must_be_possible?
 
-      requests_with_auto_merge_enabled_to(@push.branch_name).each do |merge_request|
+      merge_requests_with_auto_merge_enabled_to(@push.branch_name).each do |merge_request|
+        next unless merge_request.auto_merge_strategy == AutoMergeService::STRATEGY_MERGE_WHEN_PIPELINE_SUCCEEDS
         next unless merge_request.should_be_rebased?
 
         abort_auto_merge_with_todo(merge_request, 'target branch was updated')
@@ -167,11 +168,11 @@ module MergeRequests
       todo_service.merge_request_became_unmergeable(merge_request)
     end
 
-    def requests_with_auto_merge_enabled_to(target_branch)
+    def merge_requests_with_auto_merge_enabled_to(target_branch)
       @project
         .merge_requests
         .by_target_branch(target_branch)
-        .with_open_merge_when_pipeline_succeeds
+        .with_auto_merge_enabled
     end
 
     def mark_pending_todos_done