Skip to content

GlAlert > Update markup in ee/app/views/admin/licenses/show.html.haml

What does this MR do?

Migrates ee/app/views/admin/licenses/show.html.haml to use the shared alert HAML template.

How to test this?

  1. Apply the following patch to force the alert to show up:
diff --git a/ee/app/views/admin/licenses/show.html.haml b/ee/app/views/admin/licenses/show.html.haml
index 845633d9309..6857a768a3b 100644
--- a/ee/app/views/admin/licenses/show.html.haml
+++ b/ee/app/views/admin/licenses/show.html.haml
@@ -12,7 +12,7 @@
 
 %hr
 
-- if License.future_dated_only?
+- if true
   = render 'shared/global_alert',
     title: _('You do not have an active license'),
     variant: :info,
@@ -20,11 +20,3 @@
     dismissible: false do
     .gl-alert-body
       = _('You have a license that activates at a future date. Please see the License History table below.')
-
-- if @license.present?
-  = render 'info'
-  .license-panel.gl-mt-5
-    = render 'breakdown'
-
-- if @licenses.present?
-  = render 'license_history'
  1. Navigate to Admin area > License at /admin/license.

Screenshots (strongly suggested)

Before After
Screen_Shot_2021-06-10_at_2.40.39_PM Screen_Shot_2021-06-10_at_2.38.40_PM

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

Does this MR contain changes to processing or storing of credentials or tokens, authorization and authentication methods or other items described in the security review guidelines? If not, then delete this Security section.

  • Label as security and @ mention @gitlab-com/gl-security/appsec
  • The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • Security reports checked/validated by a reviewer from the AppSec team

Related to #325400 (closed)

Edited by Paul Gascou-Vaillancourt

Merge request reports

Loading