From 05f87da38d0cb3cd27ae423b51a2239ea4ec9d92 Mon Sep 17 00:00:00 2001
From: Luke Duncalfe <lduncalfe@eml.cc>
Date: Fri, 31 Jan 2020 16:36:58 +1300
Subject: [PATCH] Fix some GraphQL deprecation_reason strings
---
app/graphql/types/commit_type.rb | 2 +-
doc/api/graphql/reference/gitlab_schema.graphql | 10 +++++-----
doc/api/graphql/reference/gitlab_schema.json | 10 +++++-----
doc/api/graphql/reference/index.md | 4 ++--
ee/app/graphql/ee/types/issue_type.rb | 4 ++--
5 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/app/graphql/types/commit_type.rb b/app/graphql/types/commit_type.rb
index 994377cabd4bd..392e3ae41c5b6 100644
--- a/app/graphql/types/commit_type.rb
+++ b/app/graphql/types/commit_type.rb
@@ -40,7 +40,7 @@ class CommitType < BaseObject
type: Types::Ci::PipelineType,
null: true,
description: "Latest pipeline of the commit",
- deprecation_reason: 'use pipelines',
+ deprecation_reason: 'Use pipelines',
resolver: Resolvers::CommitPipelinesResolver.last
end
end
diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index 8fc13dd140b8a..b654e8bbd8b8b 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -203,7 +203,7 @@ type Commit {
Filter pipelines by their status
"""
status: PipelineStatusEnum
- ): Pipeline @deprecated(reason: "use pipelines")
+ ): Pipeline @deprecated(reason: "Use pipelines")
"""
Raw commit message
@@ -2172,9 +2172,9 @@ type EpicIssue implements Noteable {
designCollection: DesignCollection
"""
- Deprecated. Use `design_collection`
+ Deprecated. Use `designCollection`
"""
- designs: DesignCollection @deprecated(reason: "use design_collection")
+ designs: DesignCollection @deprecated(reason: "Use designCollection")
"""
Indicates discussion is locked on the issue
@@ -3062,9 +3062,9 @@ type Issue implements Noteable {
designCollection: DesignCollection
"""
- Deprecated. Use `design_collection`
+ Deprecated. Use `designCollection`
"""
- designs: DesignCollection @deprecated(reason: "use design_collection")
+ designs: DesignCollection @deprecated(reason: "Use designCollection")
"""
Indicates discussion is locked on the issue
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index f9eda31540abf..a49a9c65f4e54 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -8712,7 +8712,7 @@
},
{
"name": "designs",
- "description": "Deprecated. Use `design_collection`",
+ "description": "Deprecated. Use `designCollection`",
"args": [
],
@@ -8722,7 +8722,7 @@
"ofType": null
},
"isDeprecated": true,
- "deprecationReason": "use design_collection"
+ "deprecationReason": "Use designCollection"
},
{
"name": "discussionLocked",
@@ -10255,7 +10255,7 @@
},
{
"name": "designs",
- "description": "Deprecated. Use `design_collection`",
+ "description": "Deprecated. Use `designCollection`",
"args": [
],
@@ -10265,7 +10265,7 @@
"ofType": null
},
"isDeprecated": true,
- "deprecationReason": "use design_collection"
+ "deprecationReason": "Use designCollection"
},
{
"name": "discussionLocked",
@@ -13092,7 +13092,7 @@
"ofType": null
},
"isDeprecated": true,
- "deprecationReason": "use pipelines"
+ "deprecationReason": "Use pipelines"
},
{
"name": "message",
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index 9ed47f2aea294..69d8c82b43a64 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -334,7 +334,7 @@ Relationship between an epic and an issue
| `description` | String | Description of the issue |
| `descriptionHtml` | String | The GitLab Flavored Markdown rendering of `description` |
| `designCollection` | DesignCollection | Collection of design images associated with this issue |
-| `designs` | DesignCollection | Deprecated. Use `design_collection` |
+| `designs` | DesignCollection | Deprecated. Use `designCollection` |
| `discussionLocked` | Boolean! | Indicates discussion is locked on the issue |
| `downvotes` | Int! | Number of downvotes the issue has received |
| `dueDate` | Time | Due date of the issue |
@@ -454,7 +454,7 @@ Autogenerated return type of EpicTreeReorder
| `description` | String | Description of the issue |
| `descriptionHtml` | String | The GitLab Flavored Markdown rendering of `description` |
| `designCollection` | DesignCollection | Collection of design images associated with this issue |
-| `designs` | DesignCollection | Deprecated. Use `design_collection` |
+| `designs` | DesignCollection | Deprecated. Use `designCollection` |
| `discussionLocked` | Boolean! | Indicates discussion is locked on the issue |
| `downvotes` | Int! | Number of downvotes the issue has received |
| `dueDate` | Time | Due date of the issue |
diff --git a/ee/app/graphql/ee/types/issue_type.rb b/ee/app/graphql/ee/types/issue_type.rb
index cdb4989ab0157..08053dfa25fa2 100644
--- a/ee/app/graphql/ee/types/issue_type.rb
+++ b/ee/app/graphql/ee/types/issue_type.rb
@@ -14,9 +14,9 @@ module IssueType
resolve: -> (obj, _args, _ctx) { obj.supports_weight? ? obj.weight : nil }
field :designs, ::Types::DesignManagement::DesignCollectionType, null: true,
- description: "Deprecated. Use `design_collection`",
+ description: "Deprecated. Use `designCollection`",
method: :design_collection,
- deprecation_reason: 'use design_collection'
+ deprecation_reason: 'Use designCollection'
field :design_collection, ::Types::DesignManagement::DesignCollectionType, null: true,
description: 'Collection of design images associated with this issue'
--
GitLab