Commit 142f38b5 authored by Mark Chao's avatar Mark Chao

Remove api_billable_member_list feature flag

The API is stable.
parent 511736f2
...@@ -26,14 +26,12 @@ export default { ...@@ -26,14 +26,12 @@ export default {
default: false, default: false,
}, },
}, },
inject: ['billableSeatsHref', 'apiBillableMemberListFeatureEnabled'], inject: ['billableSeatsHref'],
computed: { computed: {
...mapState(['hasBillableGroupMembers']), ...mapState(['hasBillableGroupMembers']),
}, },
created() { created() {
if (this.apiBillableMemberListFeatureEnabled) {
this.fetchHasBillableGroupMembers(); this.fetchHasBillableGroupMembers();
}
}, },
methods: { methods: {
...mapActions(['fetchHasBillableGroupMembers']), ...mapActions(['fetchHasBillableGroupMembers']),
......
...@@ -31,7 +31,6 @@ export default (containerId = 'js-billing-plans') => { ...@@ -31,7 +31,6 @@ export default (containerId = 'js-billing-plans') => {
planRenewHref, planRenewHref,
customerPortalUrl, customerPortalUrl,
billableSeatsHref, billableSeatsHref,
apiBillableMemberListFeatureEnabled: gon?.features?.apiBillableMemberList || false,
}, },
render(createElement) { render(createElement) {
return createElement(SubscriptionApp); return createElement(SubscriptionApp);
......
...@@ -5,7 +5,6 @@ class Groups::BillingsController < Groups::ApplicationController ...@@ -5,7 +5,6 @@ class Groups::BillingsController < Groups::ApplicationController
before_action :verify_namespace_plan_check_enabled before_action :verify_namespace_plan_check_enabled
before_action only: [:index] do before_action only: [:index] do
push_frontend_feature_flag(:api_billable_member_list)
push_frontend_feature_flag(:saas_manual_renew_button) push_frontend_feature_flag(:saas_manual_renew_button)
end end
......
...@@ -9,6 +9,5 @@ class Groups::SeatUsageController < Groups::ApplicationController ...@@ -9,6 +9,5 @@ class Groups::SeatUsageController < Groups::ApplicationController
feature_category :purchase feature_category :purchase
def show def show
render_404 unless Feature.enabled?(:api_billable_member_list, @group)
end end
end end
...@@ -102,8 +102,6 @@ module BillingPlansHelper ...@@ -102,8 +102,6 @@ module BillingPlansHelper
end end
def billable_seats_href(group) def billable_seats_href(group)
return unless Feature.enabled?(:api_billable_member_list, group)
group_seat_usage_path(group) group_seat_usage_path(group)
end end
end end
---
title: Enable billable_members feature
merge_request: 49336
author:
type: added
---
name: api_billable_member_list
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43093
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/254947
milestone: '13.5'
type: development
group: group::fulfillment
default_enabled: false
...@@ -51,8 +51,6 @@ module EE ...@@ -51,8 +51,6 @@ module EE
get ":id/billable_members" do get ":id/billable_members" do
group = find_group!(params[:id]) group = find_group!(params[:id])
not_found! unless ::Feature.enabled?(:api_billable_member_list, group)
bad_request!(nil) if group.subgroup? bad_request!(nil) if group.subgroup?
bad_request!(nil) unless ::Ability.allowed?(current_user, :admin_group_member, group) bad_request!(nil) unless ::Ability.allowed?(current_user, :admin_group_member, group)
......
...@@ -39,11 +39,7 @@ describe('subscription table row', () => { ...@@ -39,11 +39,7 @@ describe('subscription table row', () => {
const defaultProps = { header: HEADER, columns: COLUMNS }; const defaultProps = { header: HEADER, columns: COLUMNS };
const createComponent = ({ const createComponent = ({ props = {}, billableSeatsHref = BILLABLE_SEATS_URL } = {}) => {
props = {},
apiBillableMemberListFeatureEnabled = true,
billableSeatsHref = BILLABLE_SEATS_URL,
} = {}) => {
if (wrapper) { if (wrapper) {
throw new Error('wrapper already exists!'); throw new Error('wrapper already exists!');
} }
...@@ -54,7 +50,6 @@ describe('subscription table row', () => { ...@@ -54,7 +50,6 @@ describe('subscription table row', () => {
...props, ...props,
}, },
provide: { provide: {
apiBillableMemberListFeatureEnabled,
billableSeatsHref, billableSeatsHref,
}, },
store, store,
......
...@@ -377,18 +377,6 @@ RSpec.describe API::Members do ...@@ -377,18 +377,6 @@ RSpec.describe API::Members do
end end
end end
context 'when feature is disabled' do
before do
stub_feature_flags(api_billable_member_list: false)
end
it 'returns error' do
subject
expect(response).to have_gitlab_http_status(:not_found)
end
end
context 'with non owner' do context 'with non owner' do
it 'returns error' do it 'returns error' do
get api(url, maintainer) get api(url, maintainer)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment