diff options
Diffstat (limited to 'app/graphql/types/permission_types/merge_request.rb')
| -rw-r--r-- | app/graphql/types/permission_types/merge_request.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/graphql/types/permission_types/merge_request.rb b/app/graphql/types/permission_types/merge_request.rb index e9c89b0c92e..52c11fe5588 100644 --- a/app/graphql/types/permission_types/merge_request.rb +++ b/app/graphql/types/permission_types/merge_request.rb @@ -19,7 +19,9 @@ module Types permission_field field_name, method: :"can_#{field_name}?", calls_gitaly: true end - permission_field :can_merge, calls_gitaly: true, resolve: -> (object, args, context) do + permission_field :can_merge, calls_gitaly: true + + def can_merge object.can_be_merged_by?(context[:current_user]) end end |