diff --git a/app/models/concerns/transitionable.rb b/app/models/concerns/transitionable.rb index 70e1fc8b78a9bb6a4dc8771cd4a199728a1170c0..b64b09336bb4f9dfbe97011eca866cc050b0d6c3 100644 --- a/app/models/concerns/transitionable.rb +++ b/app/models/concerns/transitionable.rb @@ -6,9 +6,7 @@ module Transitionable attr_accessor :transitioning def transitioning? - return false unless transitioning && Feature.enabled?(:skip_validations_during_transitions, project) - - true + transitioning end def enable_transitioning diff --git a/config/feature_flags/development/skip_validations_during_transitions.yml b/config/feature_flags/development/skip_validations_during_transitions.yml deleted file mode 100644 index 53cf5f5ee719cbd0045df10fdd0d873c67b17233..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/skip_validations_during_transitions.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: skip_validations_during_transitions -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/129848 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/423092 -milestone: '16.4' -type: development -group: group::code review -default_enabled: false diff --git a/spec/models/concerns/transitionable_spec.rb b/spec/models/concerns/transitionable_spec.rb index b80d363ef7897f40a729009a82cefbc6c1fbac9a..c8cba1ae2266795eb20101ad12e00ac83e959d99 100644 --- a/spec/models/concerns/transitionable_spec.rb +++ b/spec/models/concerns/transitionable_spec.rb @@ -22,19 +22,16 @@ def project let(:object) { klass.new(transitioning) } describe '#transitioning?' do - where(:transitioning, :feature_flag, :result) do - true | true | true - false | false | false - true | false | false - false | true | false + context "when trasnitioning" do + let(:transitioning) { true } + + it { expect(object.transitioning?).to eq(true) } end - with_them do - before do - stub_feature_flags(skip_validations_during_transitions: feature_flag) - end + context "when not trasnitioning" do + let(:transitioning) { false } - it { expect(object.transitioning?).to eq(result) } + it { expect(object.transitioning?).to eq(false) } end end end diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index d3c32da284232f6a430771a10926865db986b878..174badfb05ffcc6bb4f62a413cafe65868f81a8d 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -404,7 +404,7 @@ end end - context "with the skip_validations_during_transition_feature_flag" do + context "when transitioning between states" do let(:merge_request) { build(:merge_request, transitioning: transitioning) } where(:transitioning, :to_or_not_to) do