diff --git a/config/feature_flags/development/json_limited_encoder.yml b/config/feature_flags/development/json_limited_encoder.yml deleted file mode 100644 index 346013230a33acc2ad76fd49b06deceb4a136004..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/json_limited_encoder.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: json_limited_encoder -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38687 -rollout_issue_url: -milestone: '13.3' -type: development -group: group::source code -default_enabled: true diff --git a/lib/gitlab/json.rb b/lib/gitlab/json.rb index c26ccb5c80d32461ab166c1cb67e03a17c2d8836..3d6b2ae80081977c588b941f3b2815dd25e0ed79 100644 --- a/lib/gitlab/json.rb +++ b/lib/gitlab/json.rb @@ -248,8 +248,6 @@ class LimitedEncoder # @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 diff --git a/spec/lib/gitlab/json_spec.rb b/spec/lib/gitlab/json_spec.rb index f9f57752b0ab01bd79419bbe30cf55b70669cf30..8f846cdfab9a02fac925fa786316580f1dd8a805 100644 --- a/spec/lib/gitlab/json_spec.rb +++ b/spec/lib/gitlab/json_spec.rb @@ -440,15 +440,5 @@ expect(subject.size).to eq(10001) end end - - context 'when json_limited_encoder is disabled' do - let(:obj) { [{ test: true }] * 1000 } - - it 'does not raise an error' do - stub_feature_flags(json_limited_encoder: false) - - expect { subject }.not_to raise_error - end - end end end