diff options
| author | João Cunha <j.a.cunha@gmail.com> | 2019-02-26 10:33:32 +0000 |
|---|---|---|
| committer | João Cunha <j.a.cunha@gmail.com> | 2019-02-26 10:33:32 +0000 |
| commit | ed7065bbdb6f6fad3cc8fb369267fa811767c8a5 (patch) | |
| tree | b3fda377c51504a6d21da1742cac3de7fd668ef0 /app/graphql/types/merge_request_type.rb | |
| parent | 26c7d04cd06d1126e4a4a7a1c9308d12de77172e (diff) | |
| parent | 094d740886eaf62fd219dacd11aa9a966758a962 (diff) | |
| download | gitlab-ce-56937-edit-knative-domain-after-it-has-been-deployed.tar.gz | |
Merge branch 'master' into 56937-edit-knative-domain-after-it-has-been-deployed56937-edit-knative-domain-after-it-has-been-deployed
Diffstat (limited to 'app/graphql/types/merge_request_type.rb')
| -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 |