diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-16 12:18:00 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-02-16 12:18:00 +0300 |
| commit | 6259da15b5ede93a9f688ddd062860166e7cf21a (patch) | |
| tree | 8d2feea166d32c6c247127ca4dc50f5186d15a95 /lib/gitlab/json.rb | |
| parent | 885897989971931fcb139969b49d8b06f907d7d0 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/json.rb')
| -rw-r--r-- | lib/gitlab/json.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/gitlab/json.rb b/lib/gitlab/json.rb index c26ccb5c80d..3d6b2ae8008 100644 --- a/lib/gitlab/json.rb +++ b/lib/gitlab/json.rb @@ -248,8 +248,6 @@ module Gitlab # @return [String] # @raise [LimitExceeded] if the resulting json string is bigger than the specified limit def self.encode(object, limit: 25.megabytes) - return ::Gitlab::Json.dump(object) unless Feature.enabled?(:json_limited_encoder, default_enabled: :yaml) - buffer = StringIO.new buffer_size = 0 |