diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-20 14:18:08 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-20 14:18:08 +0300 |
| commit | 5afcbe03ead9ada87621888a31a62652b10a7e4f (patch) | |
| tree | 9918b67a0d0f0bafa6542e839a8be37adf73102d /lib/gitlab/graphql | |
| parent | c97c0201564848c1f53226fe19d71fdcc472f7d0 (diff) | |
Add latest changes from gitlab-org/gitlab@16-4-stable-eev16.4.0-rc42
Diffstat (limited to 'lib/gitlab/graphql')
| -rw-r--r-- | lib/gitlab/graphql/deprecations.rb | 1 | ||||
| -rw-r--r-- | lib/gitlab/graphql/deprecations/deprecation.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/graphql/query_analyzers/ast/recursion_analyzer.rb | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/lib/gitlab/graphql/deprecations.rb b/lib/gitlab/graphql/deprecations.rb index 9cd8462f2e8..221b19bf8a3 100644 --- a/lib/gitlab/graphql/deprecations.rb +++ b/lib/gitlab/graphql/deprecations.rb @@ -27,7 +27,6 @@ module Gitlab end # GitLab allows items to be marked as "alpha", which leverages GraphQL deprecations. - # TODO remove deprecation_args = kwargs.extract!(:alpha, :deprecated) self.deprecation = Deprecation.parse(**deprecation_args) diff --git a/lib/gitlab/graphql/deprecations/deprecation.rb b/lib/gitlab/graphql/deprecations/deprecation.rb index dfcca5ee75b..0cf555b0e34 100644 --- a/lib/gitlab/graphql/deprecations/deprecation.rb +++ b/lib/gitlab/graphql/deprecations/deprecation.rb @@ -5,7 +5,7 @@ module Gitlab module Deprecations class Deprecation REASON_RENAMED = :renamed - REASON_ALPHA = :alpha # TODO remove support in this class + REASON_ALPHA = :alpha REASONS = { REASON_RENAMED => 'This was renamed.', @@ -27,7 +27,7 @@ module Gitlab return unless options if alpha - raise ArgumentError, '`experiment` and `deprecated` arguments cannot be passed at the same time' \ + raise ArgumentError, '`alpha` and `deprecated` arguments cannot be passed at the same time' \ if deprecated options[:reason] = :alpha diff --git a/lib/gitlab/graphql/query_analyzers/ast/recursion_analyzer.rb b/lib/gitlab/graphql/query_analyzers/ast/recursion_analyzer.rb index 4e90e4c912f..34856cfc238 100644 --- a/lib/gitlab/graphql/query_analyzers/ast/recursion_analyzer.rb +++ b/lib/gitlab/graphql/query_analyzers/ast/recursion_analyzer.rb @@ -7,7 +7,7 @@ module Gitlab module QueryAnalyzers module AST class RecursionAnalyzer < GraphQL::Analysis::AST::Analyzer - IGNORED_FIELDS = %w(node edges nodes ofType).freeze + IGNORED_FIELDS = %w[node edges nodes ofType].freeze RECURSION_THRESHOLD = 2 def initialize(query) |