diff --git a/config/feature_flags/development/hamilton_seat_management.yml b/config/feature_flags/development/hamilton_seat_management.yml
deleted file mode 100644
index 08d855b546e85d3c28a27cca0c6be005970a4e87..0000000000000000000000000000000000000000
--- a/config/feature_flags/development/hamilton_seat_management.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: hamilton_seat_management
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/126964
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/419175
-milestone: '16.3'
-type: development
-group: group::subscription management
-default_enabled: false
diff --git a/ee/app/helpers/gitlab_subscriptions/code_suggestions_helper.rb b/ee/app/helpers/gitlab_subscriptions/code_suggestions_helper.rb
index 9e8d1f8034370f26fcf01783d651beb145724d9b..2f7350b55b09d7d10e55c14e1810068257d3ac43 100644
--- a/ee/app/helpers/gitlab_subscriptions/code_suggestions_helper.rb
+++ b/ee/app/helpers/gitlab_subscriptions/code_suggestions_helper.rb
@@ -4,12 +4,10 @@ module GitlabSubscriptions
module CodeSuggestionsHelper
include GitlabSubscriptions::SubscriptionHelper
- def gitlab_duo_available?(namespace = nil)
- if gitlab_com_subscription?
- Feature.enabled?(:hamilton_seat_management, namespace)
- else
- Feature.enabled?(:self_managed_code_suggestions)
- end
+ def gitlab_duo_available?(_namespace = nil)
+ return true if gitlab_com_subscription?
+
+ Feature.enabled?(:self_managed_code_suggestions)
end
def duo_pro_bulk_user_assignment_available?(namespace = nil)
diff --git a/ee/spec/helpers/gitlab_subscriptions/code_suggestions_helper_spec.rb b/ee/spec/helpers/gitlab_subscriptions/code_suggestions_helper_spec.rb
index 2b4bbb03e7290b1f7db7e10f65d1edb1b4060df7..03fe7726e7955eeb30521c989dc9755458456063 100644
--- a/ee/spec/helpers/gitlab_subscriptions/code_suggestions_helper_spec.rb
+++ b/ee/spec/helpers/gitlab_subscriptions/code_suggestions_helper_spec.rb
@@ -13,30 +13,8 @@
stub_saas_features(gitlab_com_subscriptions: true)
end
- context 'when .com feature flag is globally enabled' do
- it 'returns true' do
- expect(helper.gitlab_duo_available?(namespace)).to be_truthy
- end
- end
-
- context 'when .com feature flag is globally disabled' do
- before do
- stub_feature_flags(hamilton_seat_management: false)
- end
-
- it 'returns false' do
- expect(helper.gitlab_duo_available?(namespace)).to be_falsy
- end
-
- context 'when .com feature flag is enabled for a specific namespace' do
- before do
- stub_feature_flags(hamilton_seat_management: namespace)
- end
-
- it 'returns true' do
- expect(helper.gitlab_duo_available?(namespace)).to be_truthy
- end
- end
+ it 'returns true' do
+ expect(helper.gitlab_duo_available?(namespace)).to be_truthy
end
end
@@ -108,16 +86,6 @@
end
end
end
-
- context 'when duo pro is not available' do
- before do
- stub_feature_flags(hamilton_seat_management: false)
- end
-
- it 'returns false' do
- expect(helper.duo_pro_bulk_user_assignment_available?).to be_falsey
- end
- end
end
context 'when GitLab is self managed' do
diff --git a/ee/spec/lib/nav/gitlab_duo_usage_settings_page_spec.rb b/ee/spec/lib/nav/gitlab_duo_usage_settings_page_spec.rb
index 5023643cc1e3ef6e7dde09c46dbc499babb0640b..3f59a740cf0992b14e6bcac562c53e288a180bd4 100644
--- a/ee/spec/lib/nav/gitlab_duo_usage_settings_page_spec.rb
+++ b/ee/spec/lib/nav/gitlab_duo_usage_settings_page_spec.rb
@@ -50,41 +50,22 @@
create(:gitlab_subscription_add_on_purchase, :gitlab_duo_pro, :trial, namespace: group_with_duo_pro)
end
- context 'when hamilton_seat_management is enabled' do
- where(:has_free_or_no_subscription?, :group_with_duo_pro, :result) do
- true | ref(:another_group) | false
- false | ref(:another_group) | true
- true | ref(:group) | true
- false | ref(:group) | true
- end
-
- with_them do
- it { expect(show_gitlab_duo_usage_app?(group)).to eq(result) }
-
- context 'when feature not available' do
- before do
- stub_licensed_features(code_suggestions: false)
- end
-
- it { expect(show_gitlab_duo_usage_app?(group)).to be_falsy }
- end
- end
+ where(:has_free_or_no_subscription?, :group_with_duo_pro, :result) do
+ true | ref(:another_group) | false
+ false | ref(:another_group) | true
+ true | ref(:group) | true
+ false | ref(:group) | true
end
- context 'when hamilton_seat_management is disabled' do
- before do
- stub_feature_flags(hamilton_seat_management: false)
- end
+ with_them do
+ it { expect(show_gitlab_duo_usage_app?(group)).to eq(result) }
- where(:has_free_or_no_subscription?, :group_with_duo_pro, :result) do
- true | ref(:another_group) | false
- false | ref(:another_group) | false
- true | ref(:group) | false
- false | ref(:group) | false
- end
+ context 'when feature not available' do
+ before do
+ stub_licensed_features(code_suggestions: false)
+ end
- with_them do
- it { expect(show_gitlab_duo_usage_app?(group)).to eq(result) }
+ it { expect(show_gitlab_duo_usage_app?(group)).to be_falsy }
end
end
end
diff --git a/ee/spec/requests/api/graphql/gitlab_subscriptions/add_on_eligible_users_spec.rb b/ee/spec/requests/api/graphql/gitlab_subscriptions/add_on_eligible_users_spec.rb
index 51d76e3b5d5e7ba8762a701158bea5cb612edb7c..5f962cad516fc614329b8ea6dd22fff83921893f 100644
--- a/ee/spec/requests/api/graphql/gitlab_subscriptions/add_on_eligible_users_spec.rb
+++ b/ee/spec/requests/api/graphql/gitlab_subscriptions/add_on_eligible_users_spec.rb
@@ -83,25 +83,6 @@
create(:gitlab_subscription_user_add_on_assignment, user: developer, add_on_purchase: add_on_purchase)
end
- context 'when the :hamilton_seat_management FF is disabled' do
- let(:query) do
- graphql_query_for(
- :namespace, { full_path: add_on_purchase.namespace.full_path },
- query_graphql_field(:addOnEligibleUsers, { add_on_type: :CODE_SUGGESTIONS }, query_fields)
- )
- end
-
- before do
- stub_feature_flags(hamilton_seat_management: false)
- end
-
- it 'returns an empty collection' do
- post_graphql(query, current_user: current_user)
-
- expect(graphql_data_at(:namespace, :add_on_eligible_users, :nodes)).to match_array([])
- end
- end
-
context 'when there are search args' do
let(:query) do
graphql_query_for(
diff --git a/ee/spec/requests/api/graphql/gitlab_subscriptions/user_add_on_assignments/create_spec.rb b/ee/spec/requests/api/graphql/gitlab_subscriptions/user_add_on_assignments/create_spec.rb
index 19020a09142305af4d55eed6dffc45395e88ad44..de95fe943df4426b5703452829413be952e0367b 100644
--- a/ee/spec/requests/api/graphql/gitlab_subscriptions/user_add_on_assignments/create_spec.rb
+++ b/ee/spec/requests/api/graphql/gitlab_subscriptions/user_add_on_assignments/create_spec.rb
@@ -183,14 +183,6 @@
namespace.add_developer(assignee_user)
end
- context 'with feature flag disabled' do
- before do
- stub_feature_flags(hamilton_seat_management: false)
- end
-
- it_behaves_like 'empty response'
- end
-
it_behaves_like 'validates the query'
it_behaves_like 'success response'
diff --git a/ee/spec/requests/api/graphql/gitlab_subscriptions/user_add_on_assignments/remove_spec.rb b/ee/spec/requests/api/graphql/gitlab_subscriptions/user_add_on_assignments/remove_spec.rb
index acc03dc92cea2c1233b01502513b011a986676aa..9b3869a301538523fa8bb01ff811b792e4ecad7e 100644
--- a/ee/spec/requests/api/graphql/gitlab_subscriptions/user_add_on_assignments/remove_spec.rb
+++ b/ee/spec/requests/api/graphql/gitlab_subscriptions/user_add_on_assignments/remove_spec.rb
@@ -158,26 +158,6 @@
it_behaves_like 'success response'
- context 'when feature flag is disabled' do
- context 'when SaaS' do
- before do
- stub_saas_features(gitlab_com_subscriptions: true)
- stub_feature_flags(hamilton_seat_management: false)
- end
-
- it_behaves_like 'empty response'
- end
-
- context 'when self-managed' do
- before do
- stub_saas_features(gitlab_com_subscriptions: false)
- stub_feature_flags(self_managed_code_suggestions: false)
- end
-
- it_behaves_like 'empty response'
- end
- end
-
context 'when current_user is admin' do
let(:current_user) { create(:admin) }
diff --git a/ee/spec/services/ee/groups/group_links/destroy_service_spec.rb b/ee/spec/services/ee/groups/group_links/destroy_service_spec.rb
index b8558d393c808332128238da01fe79aecee49734..02b2aedc562fc0f7ff72ac1b1432c6681ce6359f 100644
--- a/ee/spec/services/ee/groups/group_links/destroy_service_spec.rb
+++ b/ee/spec/services/ee/groups/group_links/destroy_service_spec.rb
@@ -51,18 +51,6 @@
subject.execute(link)
end
-
- context 'when the feature flag is not enabled' do
- before do
- stub_feature_flags(hamilton_seat_management: false)
- end
-
- it 'does not enqueue CleanupUserAddOnAssignmentWorker' do
- expect(worker).not_to receive(:perform_async)
-
- subject.execute(link)
- end
- end
end
end
end
diff --git a/ee/spec/services/ee/members/destroy_service_spec.rb b/ee/spec/services/ee/members/destroy_service_spec.rb
index 7492b2b1b445e11f44729a32a52f23e442533726..88166c983a194a6585461618657dceb4e0726cd3 100644
--- a/ee/spec/services/ee/members/destroy_service_spec.rb
+++ b/ee/spec/services/ee/members/destroy_service_spec.rb
@@ -317,18 +317,6 @@
end.to change { Member.where(user: member_user).count }.by(-2)
end
end
-
- context 'when the feature flag is not enabled' do
- before do
- stub_feature_flags(hamilton_seat_management: false)
- end
-
- it 'does not enqueue CleanupUserAddOnAssignmentWorker worker' do
- expect(worker_class).not_to receive(:perform_async)
-
- destroy_service.execute(member)
- end
- end
end
end
diff --git a/ee/spec/services/projects/group_links/destroy_service_spec.rb b/ee/spec/services/projects/group_links/destroy_service_spec.rb
index a700a29941adf2227499109718897cba0756b505..f1d33475d4b4b1af192dd5b4f122dfd250443e9b 100644
--- a/ee/spec/services/projects/group_links/destroy_service_spec.rb
+++ b/ee/spec/services/projects/group_links/destroy_service_spec.rb
@@ -76,18 +76,6 @@
subject.execute(group_link)
end
-
- context 'when the feature flag is not enabled' do
- before do
- stub_feature_flags(hamilton_seat_management: false)
- end
-
- it 'does not enqueue CleanupUserAddOnAssignmentWorker' do
- expect(worker).not_to receive(:perform_async)
-
- subject.execute(group_link)
- end
- end
end
end
end