Merge branch...

Merge branch '228532-remove-feature-flag-that-controls-the-license-approval-widget-on-the-license-compliance-page' into 'master'

Remove license_approvals feature flag

See merge request gitlab-org/gitlab!38877

ee/app/assets/javascripts/vue_shared/license_compliance/license_management.vue

@@ -38,9 +38,6 @@ export default {
       'hasPendingLicenses',
       'isAddingNewLicense',
     ]),
-    hasLicenseApprovals() {
-      return Boolean(this.glFeatures.licenseApprovals);
-    },
     showLoadingSpinner() {
       return this.isLoadingManagedLicenses && !this.hasPendingLicenses;
     },
@@ -100,7 +97,7 @@ export default {
             {{ s__('LicenseCompliance|Add a license') }}
           </gl-button>
 
-          <license-approvals v-if="hasLicenseApprovals" class="gl-ml-3" />
+          <license-approvals class="gl-ml-3" />
         </div>
 
         <template v-else>

ee/app/controllers/projects/licenses_controller.rb

@@ -5,7 +5,6 @@ module Projects
     before_action :authorize_read_licenses!, only: [:index]
     before_action :authorize_admin_software_license_policy!, only: [:create, :update]
     before_action do
-      push_frontend_feature_flag(:license_approvals, default_enabled: true)
       push_frontend_feature_flag(:license_compliance_denies_mr, default_enabled: false)
     end
 

ee/spec/frontend/vue_shared/license_compliance/license_management_spec.js

@@ -147,32 +147,15 @@ describe('License Management', () => {
         });
       });
 
-      describe.each([true, false])(
-        'with licenseApprovals feature flag set to "%p"',
-        licenseApprovalsEnabled => {
-          beforeEach(() => {
-            createComponent({
-              state: { isLoadingManagedLicenses: false },
-              isAdmin: true,
-              options: {
-                provide: {
-                  glFeatures: { licenseApprovals: licenseApprovalsEnabled },
-                },
-              },
-            });
-          });
-
-          it('should render the license-approvals section accordingly', () => {
-            expect(wrapper.find(LicenseComplianceApprovals).exists()).toBe(licenseApprovalsEnabled);
-          });
-        },
-      );
-
       describe('when not loading', () => {
         beforeEach(() => {
           createComponent({ state: { isLoadingManagedLicenses: false }, isAdmin: true });
         });
 
+        it('should render the license-approvals section accordingly', () => {
+          expect(wrapper.find(LicenseComplianceApprovals).exists()).toBe(true);
+        });
+
         it('should render the form if the form is open and disable the form button', () => {
           wrapper.find(GlButton).vm.$emit('click');