Merge branch...

Merge branch '233675-replace-bootstrap-alerts-in-app/views/profiles/notifications/show.html.haml' into 'master'

Replace bootstrap alerts in app/.../show.html.haml

See merge request gitlab-org/gitlab!41310

app/views/profiles/notifications/show.html.haml

@@ -3,7 +3,11 @@
 
 %div
   - if @user.errors.any?
-    .gl-alert.gl-alert-danger
+    .gl-alert.gl-alert-danger.gl-my-5
+      %button.js-close.gl-alert-dismiss{ type: 'button', 'aria-label' => _('Dismiss') }
+        = sprite_icon('close', css_class: 'gl-icon')
+      = sprite_icon('error', css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
+      .gl-alert-body
         %ul
           - @user.errors.full_messages.each do |msg|
             %li= msg

changelogs/unreleased/233675-replace-bootstrap-alerts-in-app-views-profiles-notifications-show-.yml

+---
+title: Replace bootstrap alerts in app/views/profiles/notifications/show.html.haml
+merge_request: 41310
+author: Gilang Gumilar
+type: changed