Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 7 deletions

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 7042bc7074f..50346d97d8b 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -821,7 +821,7 @@ class MergeRequest < ApplicationRecord
   end
 
   def check_mergeability(async: false)
-    return if Feature.enabled?(:merge_requests_conditional_mergeability_check, default_enabled: true) && !recheck_merge_status?
+    return unless recheck_merge_status?
 
     check_service = MergeRequests::MergeabilityCheckService.new(self)
 
@@ -1201,12 +1201,10 @@ class MergeRequest < ApplicationRecord
   end
 
   def in_locked_state
-    begin
-      lock_mr
-      yield
-    ensure
-      unlock_mr
-    end
+    lock_mr
+    yield
+  ensure
+    unlock_mr
   end
 
   def diverged_commits_count