Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 insertions, 1 deletions

diff --git a/app/policies/merge_request_policy.rb b/app/policies/merge_request_policy.rb
index 8da2af506c7..49f9225a1d3 100644
--- a/app/policies/merge_request_policy.rb
+++ b/app/policies/merge_request_policy.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class MergeRequestPolicy < IssuablePolicy
+  condition(:can_approve) { can_approve? }
+
   rule { locked }.policy do
     prevent :reopen_merge_request
   end
@@ -14,7 +16,7 @@ class MergeRequestPolicy < IssuablePolicy
     prevent :accept_merge_request
   end
 
-  rule { can?(:update_merge_request) & is_project_member }.policy do
+  rule { can_approve }.policy do
     enable :approve_merge_request
   end
 
@@ -40,6 +42,12 @@ class MergeRequestPolicy < IssuablePolicy
   rule { can?(:admin_merge_request) }.policy do
     enable :set_merge_request_metadata
   end
+
+  private
+
+  def can_approve?
+    can?(:update_merge_request) && is_project_member?
+  end
 end
 
 MergeRequestPolicy.prepend_mod_with('MergeRequestPolicy')