diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /spec/graphql/types/permission_types/merge_request_spec.rb | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) | |
download | gitlab-ce-85dc423f7090da0a52c73eb66faf22ddb20efff9.tar.gz |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'spec/graphql/types/permission_types/merge_request_spec.rb')
-rw-r--r-- | spec/graphql/types/permission_types/merge_request_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/graphql/types/permission_types/merge_request_spec.rb b/spec/graphql/types/permission_types/merge_request_spec.rb index 73a178540a6..2849dead9a8 100644 --- a/spec/graphql/types/permission_types/merge_request_spec.rb +++ b/spec/graphql/types/permission_types/merge_request_spec.rb @@ -7,7 +7,8 @@ RSpec.describe Types::PermissionTypes::MergeRequest do expected_permissions = [ :read_merge_request, :admin_merge_request, :update_merge_request, :create_note, :push_to_source_branch, :remove_source_branch, - :cherry_pick_on_current_merge_request, :revert_on_current_merge_request + :cherry_pick_on_current_merge_request, :revert_on_current_merge_request, + :can_merge ] expect(described_class).to have_graphql_fields(expected_permissions) |