diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-17 00:12:25 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-17 00:12:25 +0300 |
commit | ee52c3666e4e2d2ad208fd95b15e2c9950ce6a23 (patch) | |
tree | e6c87e204182bad140b92f84669abe87c2a0fcde /lib/gitlab/json.rb | |
parent | 5e65d4f6c601e6636d171dbf8586949fedc334d7 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/json.rb')
-rw-r--r-- | lib/gitlab/json.rb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/gitlab/json.rb b/lib/gitlab/json.rb index 3d6b2ae8008..368b621bdfb 100644 --- a/lib/gitlab/json.rb +++ b/lib/gitlab/json.rb @@ -180,9 +180,6 @@ module Gitlab class GrapeFormatter # Convert an object to JSON. # - # This will default to the built-in Grape formatter if either :oj_json or :grape_gitlab_json - # flags are disabled. - # # The `env` param is ignored because it's not needed in either our formatter or Grape's, # but it is passed through for consistency. # @@ -194,11 +191,7 @@ module Gitlab def self.call(object, env = nil) return object.to_s if object.is_a?(PrecompiledJson) - if Feature.enabled?(:grape_gitlab_json, default_enabled: true) - Gitlab::Json.dump(object) - else - Grape::Formatter::Json.call(object, env) - end + Gitlab::Json.dump(object) end end |