diff options
| author | Luke Duncalfe <lduncalfe@gitlab.com> | 2019-02-06 15:33:11 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-02-06 15:33:11 +0300 |
| commit | 2b7dd017af7de4d09ef3a1cd835e8d07c8800b6a (patch) | |
| tree | 47615a573f6dc932353f0f6695cd4fcd050b1201 /app/graphql | |
| parent | 5bfa8e2f5e03849645570ba8c2dbfcc5c834f1b1 (diff) | |
Allow custom squash commit messages
Diffstat (limited to 'app/graphql')
| -rw-r--r-- | app/graphql/types/merge_request_type.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/graphql/types/merge_request_type.rb b/app/graphql/types/merge_request_type.rb index fb740b6fb1c..47b915b451e 100644 --- a/app/graphql/types/merge_request_type.rb +++ b/app/graphql/types/merge_request_type.rb @@ -39,7 +39,8 @@ module Types field :rebase_commit_sha, GraphQL::STRING_TYPE, null: true field :rebase_in_progress, GraphQL::BOOLEAN_TYPE, method: :rebase_in_progress?, null: false field :diff_head_sha, GraphQL::STRING_TYPE, null: true - field :merge_commit_message, GraphQL::STRING_TYPE, null: true + field :merge_commit_message, GraphQL::STRING_TYPE, method: :default_merge_commit_message, null: true, deprecation_reason: "Renamed to defaultMergeCommitMessage" + field :default_merge_commit_message, GraphQL::STRING_TYPE, null: true field :merge_ongoing, GraphQL::BOOLEAN_TYPE, method: :merge_ongoing?, null: false field :source_branch_exists, GraphQL::BOOLEAN_TYPE, method: :source_branch_exists?, null: false field :mergeable_discussions_state, GraphQL::BOOLEAN_TYPE, null: true |