Merge branch '254947-roll-out' into 'master'

Remove api_billable_member_list feature flag

See merge request gitlab-org/gitlab!49336

ee/app/assets/javascripts/billings/subscriptions/components/subscription_table_row.vue

@@ -26,14 +26,12 @@ export default {
       default: false,
     },
   },
-  inject: ['billableSeatsHref', 'apiBillableMemberListFeatureEnabled'],
+  inject: ['billableSeatsHref'],
   computed: {
     ...mapState(['hasBillableGroupMembers']),
   },
   created() {
-    if (this.apiBillableMemberListFeatureEnabled) {
-      this.fetchHasBillableGroupMembers();
-    }
+    this.fetchHasBillableGroupMembers();
   },
   methods: {
     ...mapActions(['fetchHasBillableGroupMembers']),

ee/app/assets/javascripts/billings/subscriptions/index.js

@@ -31,7 +31,6 @@ export default (containerId = 'js-billing-plans') => {
       planRenewHref,
       customerPortalUrl,
       billableSeatsHref,
-      apiBillableMemberListFeatureEnabled: gon?.features?.apiBillableMemberList || false,
     },
     render(createElement) {
       return createElement(SubscriptionApp);

ee/app/controllers/groups/billings_controller.rb

@@ -5,7 +5,6 @@ class Groups::BillingsController < Groups::ApplicationController
   before_action :verify_namespace_plan_check_enabled
 
   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_add_seats_button)
   end

ee/app/controllers/groups/seat_usage_controller.rb

@@ -9,6 +9,5 @@ class Groups::SeatUsageController < Groups::ApplicationController
   feature_category :purchase
 
   def show
-    render_404 unless Feature.enabled?(:api_billable_member_list, @group)
   end
 end

ee/app/helpers/billing_plans_helper.rb

@@ -124,8 +124,6 @@ module BillingPlansHelper
   end
 
   def billable_seats_href(group)
-    return unless Feature.enabled?(:api_billable_member_list, group)
-
     group_seat_usage_path(group)
   end
 end

ee/changelogs/unreleased/254947-roll-out.yml

+---
+title: Enable billable_members feature
+merge_request: 49336
+author:
+type: added

ee/config/feature_flags/development/api_billable_member_list.yml

----
-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

ee/lib/ee/api/members.rb

@@ -53,8 +53,6 @@ module EE
           get ":id/billable_members" do
             group = find_group!(params[:id])
 
-            not_found! unless ::Feature.enabled?(:api_billable_member_list, group)
-
             bad_request!(nil) if group.subgroup?
             bad_request!(nil) unless ::Ability.allowed?(current_user, :admin_group_member, group)
 

ee/spec/frontend/billings/subscriptions/components/subscription_table_row_spec.js

@@ -39,11 +39,7 @@ describe('subscription table row', () => {
 
   const defaultProps = { header: HEADER, columns: COLUMNS };
 
-  const createComponent = ({
-    props = {},
-    apiBillableMemberListFeatureEnabled = true,
-    billableSeatsHref = BILLABLE_SEATS_URL,
-  } = {}) => {
+  const createComponent = ({ props = {}, billableSeatsHref = BILLABLE_SEATS_URL } = {}) => {
     if (wrapper) {
       throw new Error('wrapper already exists!');
     }
@@ -54,7 +50,6 @@ describe('subscription table row', () => {
         ...props,
       },
       provide: {
-        apiBillableMemberListFeatureEnabled,
         billableSeatsHref,
       },
       store,

ee/spec/requests/api/members_spec.rb

@@ -419,18 +419,6 @@ RSpec.describe API::Members do
       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
       it 'returns error' do
         get api(url, maintainer)