Merge branch...

Merge branch '233653-replace-bootstrap-alerts-in-ee-app-views-admin-licenses-_repeat_trial_info-html-haml' into 'master'

Resolve "Replace bootstrap alerts in ee/app/views/admin/licenses/_repeat_trial_info.html.haml"

See merge request gitlab-org/gitlab!41070

ee/app/views/admin/licenses/_repeat_trial_info.html.haml

-#repeat-trial-info.bs-callout.bs-callout-info.alert.alert-dismissible.fade.in.show{ role: "alert" }
-  %button.close{ type: "button", 'data-dismiss': "alert", 'aria-label': "Close" }
-    %span
-      = sprite_icon('close')
+#repeat-trial-info.bs-callout.bs-callout-info.gl-alert.fade.in.show{ role: "alert" }
+  %button.js-close.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') }
+    = sprite_icon('close', size: 16, css_class: 'gl-icon')
   %h4
     = _('Free Trial')
   %p

ee/changelogs/unreleased/233653-replace-bootstrap-alerts-in-ee-app-views-admin-licenses-_repeat_tr.yml

+---
+title: Replace bootstrap alerts in ee/app/views/admin/licenses/_repeat_trial_info.html.haml
+merge_request: 41070
+author: Jacopo Beschi @jacopo-beschi
+type: changed