diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-02-18 10:18:48 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-02-18 10:18:48 +0000 |
| commit | 08271ba496fa9ee2cd8a3e004f4a851a16f124bf (patch) | |
| tree | d6d45aa13dcfaabdfa1aa8c57bae6efef6177da8 | |
| parent | ff81747fbbd339da495b7b4c42df40df443961b0 (diff) | |
| parent | 99c6f73371894f079427075ab138f2291623fb64 (diff) | |
| download | gitlab-ce-08271ba496fa9ee2cd8a3e004f4a851a16f124bf.tar.gz | |
Merge branch 'remove-duplicate-field-from-merge-request-type' into 'master'
Remove duplicate field from MergeRequestType
See merge request gitlab-org/gitlab-ce!25330
| -rw-r--r-- | app/graphql/types/merge_request_type.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/graphql/types/merge_request_type.rb b/app/graphql/types/merge_request_type.rb index 47b915b451e..7e63d4022b1 100644 --- a/app/graphql/types/merge_request_type.rb +++ b/app/graphql/types/merge_request_type.rb @@ -38,7 +38,6 @@ module Types field :should_be_rebased, GraphQL::BOOLEAN_TYPE, method: :should_be_rebased?, null: false 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, 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 |