Commit a7671a68 authored by Fabio Huser's avatar Fabio Huser

Expose suggestion_commit_message via Project GraphQL API

parent 44cfd45c
......@@ -104,6 +104,8 @@ module Types
description: 'Indicates if `Delete source branch` option should be enabled by default for all new merge requests of the project'
field :autoclose_referenced_issues, GraphQL::BOOLEAN_TYPE, null: true,
description: 'Indicates if issues referenced by merge requests and commits within the default branch are closed automatically'
field :suggestion_commit_message, GraphQL::STRING_TYPE, null: true,
description: 'The commit message used to apply merge request suggestions'
field :namespace, Types::NamespaceType, null: true,
description: 'Namespace of the project'
......
......@@ -5154,6 +5154,11 @@ type Project {
"""
statistics: ProjectStatistics
"""
The commit message used to apply merge request suggestions
"""
suggestionCommitMessage: String
"""
List of project tags
"""
......
......@@ -1525,6 +1525,20 @@
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "suggestionCommitMessage",
"description": "The commit message used to apply merge request suggestions",
"args": [
],
"type": {
"kind": "SCALAR",
"name": "String",
"ofType": null
},
"isDeprecated": false,
"deprecationReason": null
},
{
"name": "tagList",
"description": "List of project tags",
......
......@@ -769,6 +769,7 @@ Information about pagination in a connection.
| `printingMergeRequestLinkEnabled` | Boolean | Indicates if a link to create or view a merge request should display after a push to Git repositories of the project from the command line |
| `removeSourceBranchAfterMerge` | Boolean | Indicates if `Delete source branch` option should be enabled by default for all new merge requests of the project |
| `autocloseReferencedIssues` | Boolean | Indicates if issues referenced by merge requests and commits within the default branch are closed automatically |
| `suggestionCommitMessage` | String | The commit message used to apply merge request suggestions |
| `namespace` | Namespace | Namespace of the project |
| `group` | Group | Group of the project |
| `statistics` | ProjectStatistics | Statistics of the project |
......
......@@ -104,7 +104,7 @@ describe 'Project settings > [EE] Merge Requests', :js do
it "does not mention the merge request template in the section's description text" do
visit edit_project_path(project)
expect(page).to have_content('Choose your merge method, merge options, and merge checks.')
expect(page).to have_content('Choose your merge method, merge options, merge checks, and merge suggestions.')
end
end
......@@ -122,7 +122,7 @@ describe 'Project settings > [EE] Merge Requests', :js do
it "mentions the merge request template in the section's description text" do
visit edit_project_path(project)
expect(page).to have_content('Choose your merge method, merge options, merge checks, and set up a default description template for merge requests.')
expect(page).to have_content('Choose your merge method, merge options, merge checks, merge suggestions, and set up a default description template for merge requests.')
end
end
end
......@@ -23,7 +23,7 @@ describe GitlabSchema.types['Project'] do
only_allow_merge_if_all_discussions_are_resolved printing_merge_request_link_enabled
namespace group statistics repository merge_requests merge_request issues
issue pipelines removeSourceBranchAfterMerge sentryDetailedError snippets
grafanaIntegration autocloseReferencedIssues
grafanaIntegration autocloseReferencedIssues suggestion_commit_message
]
is_expected.to include_graphql_fields(*expected_fields)
......
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