diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-19 12:08:42 +0300 |
| commit | b76ae638462ab0f673e5915986070518dd3f9ad3 (patch) | |
| tree | bdab0533383b52873be0ec0eb4d3c66598ff8b91 /lib/gitlab/graphql | |
| parent | 434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff) | |
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'lib/gitlab/graphql')
| -rw-r--r-- | lib/gitlab/graphql/copy_field_description.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/graphql/markdown_field.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/graphql/copy_field_description.rb b/lib/gitlab/graphql/copy_field_description.rb index edd73083ff2..ed2273bc91a 100644 --- a/lib/gitlab/graphql/copy_field_description.rb +++ b/lib/gitlab/graphql/copy_field_description.rb @@ -11,7 +11,7 @@ module Gitlab # are always identical to the corresponding query field descriptions. # # E.g.: - # argument :name, GraphQL::STRING_TYPE, description: copy_field_description(Types::UserType, :name) + # argument :name, GraphQL::Types::String, description: copy_field_description(Types::UserType, :name) def copy_field_description(type, field_name) type.fields[field_name.to_s.camelize(:lower)].description end diff --git a/lib/gitlab/graphql/markdown_field.rb b/lib/gitlab/graphql/markdown_field.rb index 0b5bde8d8d9..6188d860aba 100644 --- a/lib/gitlab/graphql/markdown_field.rb +++ b/lib/gitlab/graphql/markdown_field.rb @@ -19,7 +19,7 @@ module Gitlab # Adding complexity to rendered notes since that could cause queries. kwargs[:complexity] ||= 5 - field name, GraphQL::STRING_TYPE, **kwargs + field name, GraphQL::Types::String, **kwargs define_method resolver_method do # We need to `dup` the context so the MarkdownHelper doesn't modify it |