Merge branch...

Merge branch '233699-replace-bootstrap-alerts-in-ee/app/views/admin/licenses/new.html.haml' into 'master'

Replace bootstrap alerts in ee/app/views/admin/licenses/new.html.haml

See merge request gitlab-org/gitlab!41275

changelogs/unreleased/233699-replace-bootstrap-alerts-in-ee-app-views-admin-licenses-new-html-h.yml

+---
+title: Replace bootstrap alerts in ee/app/views/admin/licenses/new.html.haml
+merge_request: 41275
+author: Gilang Gumilar
+type: changed

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

@@ -10,9 +10,17 @@
 = form_for @license, url: admin_license_path, html: { multipart: true, class: 'fieldset-form' } do |f|
   - if @license.errors.any?
     #error_explanation
-      .alert.alert-danger
+      .gl-alert.gl-alert-danger.gl-mb-5
+        = sprite_icon('warning', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
+        .gl-alert-body
+          %p= _('The form contains the following errors:')
+          %details
+            %summary= n_('%d error found:', '%d errors found:', @license.errors.full_messages.length) % @license.errors.full_messages.length
+            %ul
               - @license.errors.full_messages.each do |msg|
-          %p= msg
+                %li= msg
+
+
 
   .form-group.row
     .col-sm-2

ee/spec/features/admin/licenses/admin_uploads_license_spec.rb

@@ -136,6 +136,7 @@ RSpec.describe "Admin uploads license", :js do
       it "doesn't upload license" do
         attach_and_upload(path)
 
+        find('.gl-alert details').click
         expect(page).to have_content("This license has already expired.")
       end
     end

locale/gitlab.pot

@@ -180,6 +180,11 @@ msgid_plural "%d errors"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "%d error found:"
+msgid_plural "%d errors found:"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "%d exporter"
 msgid_plural "%d exporters"
 msgstr[0] ""
@@ -27091,6 +27096,9 @@ msgstr ""
 msgid "The form contains the following error:"
 msgstr ""
 
+msgid "The form contains the following errors:"
+msgstr ""
+
 msgid "The form contains the following warning:"
 msgstr ""