diff --git a/config/feature_flags/development/seat_count_alerts.yml b/config/feature_flags/development/seat_count_alerts.yml deleted file mode 100644 index 9b2f3a2ef55ca30de9343fa72bd22c9c5e89d837..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/seat_count_alerts.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: seat_count_alerts -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/89204 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362041 -milestone: '15.1' -type: development -group: group::purchase -default_enabled: false diff --git a/ee/app/controllers/concerns/gitlab_subscriptions/seat_count_alert.rb b/ee/app/controllers/concerns/gitlab_subscriptions/seat_count_alert.rb index e3eb77351a1bf8b8f716bf6049e2b2f68fed2392..ea452b3d362ae2dde9a9541fbd279a5e94af4a73 100644 --- a/ee/app/controllers/concerns/gitlab_subscriptions/seat_count_alert.rb +++ b/ee/app/controllers/concerns/gitlab_subscriptions/seat_count_alert.rb @@ -4,7 +4,6 @@ module GitlabSubscriptions module SeatCountAlert def generate_seat_count_alert_data(namespace) return unless current_user && (root_ancestor = namespace&.root_ancestor) - return if Feature.disabled?(:seat_count_alerts, root_ancestor) GitlabSubscriptions::Reconciliations::CalculateSeatCountDataService.new( namespace: root_ancestor, diff --git a/ee/spec/controllers/concerns/gitlab_subscriptions/seat_count_alert_spec.rb b/ee/spec/controllers/concerns/gitlab_subscriptions/seat_count_alert_spec.rb index f304ff26945c0d5a52529c050cc2d78992ac444b..528098a0b5b878b9bdfb437cda72ad130be05177 100644 --- a/ee/spec/controllers/concerns/gitlab_subscriptions/seat_count_alert_spec.rb +++ b/ee/spec/controllers/concerns/gitlab_subscriptions/seat_count_alert_spec.rb @@ -32,14 +32,6 @@ end end - context 'when the feature flag is disabled' do - it 'does not set the seat count data' do - stub_feature_flags(seat_count_alerts: false) - - expect(controller.generate_seat_count_alert_data(root_ancestor)).to be_nil - end - end - context 'when supplied a project' do it 'sets the data based on the root ancestor' do project = build(:project, namespace: root_ancestor) diff --git a/ee/spec/features/gitlab_subscriptions/seat_count_alert_spec.rb b/ee/spec/features/gitlab_subscriptions/seat_count_alert_spec.rb index b87f862a2e5497732634301a2d71b241f87246ea..06477a84290c4877c4028b5b3b9c6d15291e7717 100644 --- a/ee/spec/features/gitlab_subscriptions/seat_count_alert_spec.rb +++ b/ee/spec/features/gitlab_subscriptions/seat_count_alert_spec.rb @@ -58,17 +58,6 @@ it_behaves_like 'a hidden alert' end - context 'when the feature flag is disabled' do - before do - group.add_owner(user) - sign_in(user) - - stub_feature_flags(seat_count_alerts: false) - end - - it_behaves_like 'a hidden alert' - end - context 'when the user is eligible for the alert' do before do group.add_owner(user) diff --git a/ee/spec/support/shared_examples/controllers/concerns/seat_count_alert_shared_examples.rb b/ee/spec/support/shared_examples/controllers/concerns/seat_count_alert_shared_examples.rb index e8966407713d492dc4b125d44898eb775dccf9c9..33eb8dc7230ae7722e001ac95c13286a7cd142a4 100644 --- a/ee/spec/support/shared_examples/controllers/concerns/seat_count_alert_shared_examples.rb +++ b/ee/spec/support/shared_examples/controllers/concerns/seat_count_alert_shared_examples.rb @@ -22,20 +22,6 @@ end end - context 'when the feature flag is disabled' do - it 'sets the seat_count_data to nil' do - stub_feature_flags(seat_count_alerts: false) - - allow_next_instance_of(GitlabSubscriptions::Reconciliations::CalculateSeatCountDataService) do |service| - allow(service).to receive(:execute).and_return(seat_count_data) - end - - subject - - expect(assigns(:seat_count_data)).to be_nil - end - end - context 'when the namespace does not qualify for the alert' do it 'sets the seat_count_data to nil' do allow_next_instance_of(GitlabSubscriptions::Reconciliations::CalculateSeatCountDataService) do |service|