summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Duncalfe <lduncalfe@eml.cc>2019-02-18 15:30:58 +1300
committermfluharty <mfluharty@gitlab.com>2019-02-20 11:20:33 -0700
commitd73fb55a102f9f3f552b8ca54838766d819b71aa (patch)
tree58e5c5f3757e65b3ebc38cc3f309081ffc41ea9f
parentd6c2c353a3393df33392d6693ac11253c61da933 (diff)
downloadgitlab-ce-d73fb55a102f9f3f552b8ca54838766d819b71aa.tar.gz
Removing duplicate field from MergeRequestType
-rw-r--r--app/graphql/types/merge_request_type.rb1
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