summaryrefslogtreecommitdiff
path: root/lib/gitlab/json.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-05-19 07:33:21 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-05-19 07:33:21 +0000
commit36a59d088eca61b834191dacea009677a96c052f (patch)
treee4f33972dab5d8ef79e3944a9f403035fceea43f /lib/gitlab/json.rb
parenta1761f15ec2cae7c7f7bbda39a75494add0dfd6f (diff)
downloadgitlab-ce-36a59d088eca61b834191dacea009677a96c052f.tar.gz
Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42
Diffstat (limited to 'lib/gitlab/json.rb')
-rw-r--r--lib/gitlab/json.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/json.rb b/lib/gitlab/json.rb
index 9824b46554f..512936bb4f4 100644
--- a/lib/gitlab/json.rb
+++ b/lib/gitlab/json.rb
@@ -160,7 +160,7 @@ module Gitlab
# @raise [JSON::ParserError]
def handle_legacy_mode!(data)
return data unless feature_table_exists?
- return data unless Feature.enabled?(:json_wrapper_legacy_mode, default_enabled: true)
+ return data unless Feature.enabled?(:json_wrapper_legacy_mode)
raise parser_error if INVALID_LEGACY_TYPES.any? { |type| data.is_a?(type) }
end