Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 4 deletions

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 2b4d0949a92..2773569161d 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -1201,10 +1201,17 @@ class MergeRequest < ApplicationRecord
   end
   alias_method :wip_title, :draft_title
 
-  def mergeable?(skip_ci_check: false, skip_discussions_check: false)
+  def skipped_mergeable_checks(options = {})
+    {
+      skip_ci_check: options.fetch(:auto_merge_requested, false)
+    }
+  end
+
+  def mergeable?(skip_ci_check: false, skip_discussions_check: false, skip_approved_check: false)
     return false unless mergeable_state?(
       skip_ci_check: skip_ci_check,
-      skip_discussions_check: skip_discussions_check
+      skip_discussions_check: skip_discussions_check,
+      skip_approved_check: skip_approved_check
     )
 
     check_mergeability
@@ -1225,11 +1232,12 @@ class MergeRequest < ApplicationRecord
     ]
   end
 
-  def mergeable_state?(skip_ci_check: false, skip_discussions_check: false)
+  def mergeable_state?(skip_ci_check: false, skip_discussions_check: false, skip_approved_check: false)
     additional_checks = execute_merge_checks(
       params: {
         skip_ci_check: skip_ci_check,
-        skip_discussions_check: skip_discussions_check
+        skip_discussions_check: skip_discussions_check,
+        skip_approved_check: skip_approved_check
       }
     )
     additional_checks.success?