diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb index dd5debdf4a081de6be4ac4e5a8082039c118dbf3..da427a7e068e44ce117b34cf1508409712c9cedf 100644 --- a/app/models/commit_status.rb +++ b/app/models/commit_status.rb @@ -36,7 +36,7 @@ class CommitStatus < Ci::ApplicationRecord validates :pipeline, presence: true, unless: :importing? validates :name, presence: true, unless: :importing? - validates :stage, :ref, :target_url, :description, length: { maximum: 255 }, if: :ci_builds_columns_size_validation_enabled? + validates :stage, :ref, :target_url, :description, length: { maximum: 255 } alias_attribute :author, :user alias_attribute :pipeline_id, :commit_id @@ -321,8 +321,4 @@ def stage_name def unrecoverable_failure? script_failure? || missing_dependency_failure? || archived_failure? || scheduler_failure? || data_integrity_failure? end - - def ci_builds_columns_size_validation_enabled? - Feature.enabled?(:ci_builds_columns_size_validation, project) - end end diff --git a/config/feature_flags/development/ci_builds_columns_size_validation.yml b/config/feature_flags/development/ci_builds_columns_size_validation.yml deleted file mode 100644 index f7dff9d227561ffd8f0113ed6c9e2e0d4e1b1e17..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/ci_builds_columns_size_validation.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: ci_builds_columns_size_validation -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/118148 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/407404 -milestone: '16.0' -type: development -group: group::pipeline execution -default_enabled: false diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb index 7a7ea9e09cd6b408afd1c6919cd3a41c02c58e51..d033d4adba79ea87ec5aae3e9102017db622fce4 100644 --- a/spec/models/commit_status_spec.rb +++ b/spec/models/commit_status_spec.rb @@ -34,17 +34,6 @@ def create_status(**opts) it { is_expected.to validate_length_of(:target_url).is_at_most(255) } it { is_expected.to validate_length_of(:description).is_at_most(255) } - context 'when feature flag ci_builds_columns_size_validation is disabled' do - before do - stub_feature_flags(ci_builds_columns_size_validation: false) - end - - it { is_expected.not_to validate_length_of(:stage).is_at_most(255) } - it { is_expected.not_to validate_length_of(:ref).is_at_most(255) } - it { is_expected.not_to validate_length_of(:target_url).is_at_most(255) } - it { is_expected.not_to validate_length_of(:description).is_at_most(255) } - end - it { is_expected.to delegate_method(:sha).to(:pipeline) } it { is_expected.to delegate_method(:short_sha).to(:pipeline) }