Commit 15159d0d authored by Nick Thomas's avatar Nick Thomas

Merge branch '35428-step1-add-read-merge-request-to-gql-be' into 'master'

Step 1 - Add read_merge_request to GraphQL ProjectPermission BE

See merge request gitlab-org/gitlab!24524
parents e8d2c886 d16bf950
...@@ -16,7 +16,8 @@ module Types ...@@ -16,7 +16,8 @@ module Types
:create_deployment, :push_to_delete_protected_branch, :create_deployment, :push_to_delete_protected_branch,
:admin_wiki, :admin_project, :update_pages, :admin_wiki, :admin_project, :update_pages,
:admin_remote_mirror, :create_label, :update_wiki, :destroy_wiki, :admin_remote_mirror, :create_label, :update_wiki, :destroy_wiki,
:create_pages, :destroy_pages, :read_pages_content, :admin_operations :create_pages, :destroy_pages, :read_pages_content, :admin_operations,
:read_merge_request
permission_field :create_snippet permission_field :create_snippet
......
...@@ -5831,6 +5831,11 @@ type ProjectPermissions { ...@@ -5831,6 +5831,11 @@ type ProjectPermissions {
""" """
readDesign: Boolean! readDesign: Boolean!
"""
Indicates the user can perform `read_merge_request` on this resource
"""
readMergeRequest: Boolean!
""" """
Indicates the user can perform `read_pages_content` on this resource Indicates the user can perform `read_pages_content` on this resource
""" """
......
...@@ -2253,6 +2253,24 @@ ...@@ -2253,6 +2253,24 @@
"isDeprecated": false, "isDeprecated": false,
"deprecationReason": null "deprecationReason": null
}, },
{
"name": "readMergeRequest",
"description": "Indicates the user can perform `read_merge_request` on this resource",
"args": [
],
"type": {
"kind": "NON_NULL",
"name": null,
"ofType": {
"kind": "SCALAR",
"name": "Boolean",
"ofType": null
}
},
"isDeprecated": false,
"deprecationReason": null
},
{ {
"name": "readPagesContent", "name": "readPagesContent",
"description": "Indicates the user can perform `read_pages_content` on this resource", "description": "Indicates the user can perform `read_pages_content` on this resource",
......
...@@ -867,6 +867,7 @@ Information about pagination in a connection. ...@@ -867,6 +867,7 @@ Information about pagination in a connection.
| `readCommitStatus` | Boolean! | Indicates the user can perform `read_commit_status` on this resource | | `readCommitStatus` | Boolean! | Indicates the user can perform `read_commit_status` on this resource |
| `readCycleAnalytics` | Boolean! | Indicates the user can perform `read_cycle_analytics` on this resource | | `readCycleAnalytics` | Boolean! | Indicates the user can perform `read_cycle_analytics` on this resource |
| `readDesign` | Boolean! | Indicates the user can perform `read_design` on this resource | | `readDesign` | Boolean! | Indicates the user can perform `read_design` on this resource |
| `readMergeRequest` | Boolean! | Indicates the user can perform `read_merge_request` on this resource |
| `readPagesContent` | Boolean! | Indicates the user can perform `read_pages_content` on this resource | | `readPagesContent` | Boolean! | Indicates the user can perform `read_pages_content` on this resource |
| `readProject` | Boolean! | Indicates the user can perform `read_project` on this resource | | `readProject` | Boolean! | Indicates the user can perform `read_project` on this resource |
| `readProjectMember` | Boolean! | Indicates the user can perform `read_project_member` on this resource | | `readProjectMember` | Boolean! | Indicates the user can perform `read_project_member` on this resource |
......
...@@ -12,7 +12,8 @@ describe Types::PermissionTypes::Project do ...@@ -12,7 +12,8 @@ describe Types::PermissionTypes::Project do
:read_commit_status, :request_access, :create_pipeline, :create_pipeline_schedule, :read_commit_status, :request_access, :create_pipeline, :create_pipeline_schedule,
:create_merge_request_from, :create_wiki, :push_code, :create_deployment, :push_to_delete_protected_branch, :create_merge_request_from, :create_wiki, :push_code, :create_deployment, :push_to_delete_protected_branch,
:admin_wiki, :admin_project, :update_pages, :admin_remote_mirror, :create_label, :admin_wiki, :admin_project, :update_pages, :admin_remote_mirror, :create_label,
:update_wiki, :destroy_wiki, :create_pages, :destroy_pages, :read_pages_content :update_wiki, :destroy_wiki, :create_pages, :destroy_pages, :read_pages_content,
:read_merge_request
] ]
expected_permissions.each do |permission| expected_permissions.each do |permission|
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment