diff --git a/config/feature_flags/development/introduce_ci_max_total_yaml_size_bytes.yml b/config/feature_flags/development/introduce_ci_max_total_yaml_size_bytes.yml deleted file mode 100644 index e52eac5d74807b1a3aa5382aed3512fd555f7c11..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/introduce_ci_max_total_yaml_size_bytes.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: introduce_ci_max_total_yaml_size_bytes -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/123129 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/419561 -milestone: '16.3' -type: development -group: group::pipeline authoring -default_enabled: false diff --git a/lib/gitlab/ci/config/external/mapper/verifier.rb b/lib/gitlab/ci/config/external/mapper/verifier.rb index 580cae8a2071bef1269b850f1a1012bf0f16f616..0e296aa0b5b2899bcf98b6182c5c8f3e3f4ae115 100644 --- a/lib/gitlab/ci/config/external/mapper/verifier.rb +++ b/lib/gitlab/ci/config/external/mapper/verifier.rb @@ -40,7 +40,7 @@ def process_without_instrumentation(files) file.validate_content! if file.valid? file.load_and_validate_expanded_hash! if file.valid? - next unless Feature.enabled?(:introduce_ci_max_total_yaml_size_bytes, context.project) && file.valid? + next unless file.valid? # We are checking the file.content.to_s because that is returning the actual content of the file, # whereas file.content would return the BatchLoader. diff --git a/spec/lib/gitlab/ci/config/external/mapper/verifier_spec.rb b/spec/lib/gitlab/ci/config/external/mapper/verifier_spec.rb index 69b0524be9e5b82f895f3b916f7df739ef3f251d..f542c0485e072539fde347a646d9a576c99044b6 100644 --- a/spec/lib/gitlab/ci/config/external/mapper/verifier_spec.rb +++ b/spec/lib/gitlab/ci/config/external/mapper/verifier_spec.rb @@ -409,32 +409,6 @@ expect { process }.to raise_error(expected_error_class) end end - - context 'when introduce_ci_max_total_yaml_size_bytes is disabled' do - before do - stub_feature_flags(introduce_ci_max_total_yaml_size_bytes: false) - end - - context 'when pipeline tree size is within the limit' do - before do - stub_application_setting(ci_max_total_yaml_size_bytes: 10000) - end - - it 'passes the verification' do - expect(process.all?(&:valid?)).to be_truthy - end - end - - context 'when pipeline tree size is larger then the limit' do - before do - stub_application_setting(ci_max_total_yaml_size_bytes: 100) - end - - it 'passes the verification' do - expect(process.all?(&:valid?)).to be_truthy - end - end - end end end end