Merge branch '337026-limit-subscription-page-width-to-990' into 'master'

Limit subscription page container to 990px

See merge request gitlab-org/gitlab!77947

ee/app/assets/javascripts/admin/subscriptions/show/components/app.vue

@@ -128,7 +128,7 @@ export default {
       v-on="$options.activationListeners"
     />
     <div v-else class="row">
-      <div class="col-12 col-lg-8 offset-lg-2">
+      <div class="col-12">
         <h3 class="gl-mb-7 gl-mt-6 gl-text-center" data-testid="subscription-activation-title">
           {{ $options.i18n.noActiveSubscription }}
         </h3>

ee/app/assets/javascripts/admin/subscriptions/show/components/subscription_breakdown.vue

@@ -181,47 +181,53 @@ export default {
           data-testid="subscription-details"
         >
           <template v-if="shouldShowFooter" #footer>
-            <gl-button
-              v-if="canSyncSubscription"
-              category="primary"
-              :loading="hasAsyncActivity"
-              variant="confirm"
-              data-testid="subscription-sync-action"
-              @click="syncSubscription"
-            >
-              {{ $options.i18n.syncSubscriptionButtonText }}
-            </gl-button>
-            <gl-button
-              v-if="canActivateSubscription"
-              v-gl-modal="$options.modal.id"
-              category="primary"
-              variant="confirm"
-              data-testid="subscription-activate-subscription-action"
-            >
-              {{ $options.i18n.activateCloudLicense }}
-            </gl-button>
-            <gl-button
-              v-if="canManageSubscription"
-              :href="customersPortalUrl"
-              target="_blank"
-              category="secondary"
-              variant="confirm"
-              data-testid="subscription-manage-action"
-            >
-              {{ $options.i18n.manageSubscriptionButtonText }}
-            </gl-button>
-            <gl-button
-              v-if="canRemoveLicense"
-              category="secondary"
-              variant="danger"
-              :href="licenseRemovePath"
-              :data-confirm="$options.i18n.removeLicenseConfirm"
-              data-method="delete"
-              data-testid="license-remove-action"
-              data-qa-selector="remove_license_link"
-            >
-              {{ $options.i18n.removeLicense }}
-            </gl-button>
+            <div class="gl-display-flex gl-flex-wrap gl-align-items-flex-start">
+              <gl-button
+                v-if="canSyncSubscription"
+                category="primary"
+                :loading="hasAsyncActivity"
+                variant="confirm"
+                data-testid="subscription-sync-action"
+                class="gl-mr-3 gl-mb-3 gl-lg-mb-0"
+                @click="syncSubscription"
+              >
+                {{ $options.i18n.syncSubscriptionButtonText }}
+              </gl-button>
+              <gl-button
+                v-if="canActivateSubscription"
+                v-gl-modal="$options.modal.id"
+                category="primary"
+                variant="confirm"
+                class="gl-mr-3 gl-mb-3 gl-lg-mb-0"
+                data-testid="subscription-activate-subscription-action"
+              >
+                {{ $options.i18n.activateCloudLicense }}
+              </gl-button>
+              <gl-button
+                v-if="canManageSubscription"
+                :href="customersPortalUrl"
+                target="_blank"
+                category="secondary"
+                variant="confirm"
+                class="gl-mr-3 gl-mb-3 gl-lg-mb-0"
+                data-testid="subscription-manage-action"
+              >
+                {{ $options.i18n.manageSubscriptionButtonText }}
+              </gl-button>
+              <gl-button
+                v-if="canRemoveLicense"
+                category="secondary"
+                variant="danger"
+                class="gl-mr-3"
+                :href="licenseRemovePath"
+                :data-confirm="$options.i18n.removeLicenseConfirm"
+                data-method="delete"
+                data-testid="license-remove-action"
+                data-qa-selector="remove_license_link"
+              >
+                {{ $options.i18n.removeLicense }}
+              </gl-button>
+            </div>
           </template>
         </subscription-details-card>
       </div>

ee/app/controllers/admin/subscriptions_controller.rb

@@ -6,5 +6,7 @@ class Admin::SubscriptionsController < Admin::ApplicationController
 
   feature_category :license
 
-  def show; end
+  def show
+    @content_class = 'limit-container-width'
+  end
 end