Merge branch 'Update-markup-in-milestones/_top-haml-file' into 'master'

Update gl-alert markup

See merge request gitlab-org/gitlab!63248

app/views/projects/milestones/show.html.haml

@@ -12,19 +12,17 @@
 = render_if_exists 'shared/milestones/burndown', milestone: @milestone, project: @project
 
 - if can?(current_user, :read_issue, @project) && @milestone.total_issues_count == 0
-  .gl-alert.gl-alert-info.gl-mt-3.gl-mb-5{ data: { testid: 'no-issues-alert' } }
-    .gl-alert-container
-      = sprite_icon('information-o', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
-      .gl-alert-content
-        .gl-alert-body
-          %span= _('Assign some issues to this milestone.')
-- elsif @milestone.complete? && @milestone.active?
-  .gl-alert.gl-alert-success.gl-mt-3.gl-mb-5{ data: { testid: 'all-issues-closed-alert' } }
-    .gl-alert-container
-      = sprite_icon('check-circle', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
-      .gl-alert-content
-        .gl-alert-body
-          %span= _('All issues for this milestone are closed. You may close this milestone now.')
+  = render 'shared/global_alert',
+    variant: :info,
+    dismissible: false,
+    is_contained: true,
+    alert_data: { testid: 'no-issues-alert' },
+    alert_class: 'gl-mt-3 gl-mb-5' do
+    .gl-alert-body
+      = _('Assign some issues to this milestone.')
+- else
+  = render 'shared/milestones/milestone_complete_alert', milestone: @milestone do
+    = _('All issues for this milestone are closed. You may close this milestone now.')
 
 = render 'shared/milestones/tabs', milestone: @milestone
 = render 'shared/milestones/sidebar', milestone: @milestone, project: @project, affix_offset: 153

app/views/shared/milestones/_milestone_complete_alert.html.haml

+- milestone = local_assigns[:milestone]
+
+- if milestone.complete? && milestone.active?
+  = render 'shared/global_alert',
+    variant: :success,
+    is_contained: true,
+    alert_data: { testid: 'all-issues-closed-alert' },
+    dismissible: false do
+    .gl-alert-body
+    = yield

app/views/shared/milestones/_top.html.haml

@@ -5,11 +5,8 @@
 
 = render 'shared/milestones/header', milestone: milestone
 = render 'shared/milestones/description', milestone: milestone
-
-- if milestone.complete? && milestone.active?
-  .gl-alert.gl-alert-success.gl-mt-3
-    %span
-      = _('All issues for this milestone are closed.')
-      = group ? _('You may close the milestone now.') : _('Navigate to the project to close the milestone.')
+= render 'shared/milestones/milestone_complete_alert', milestone: milestone do
+  = _('All issues for this milestone are closed.')
+  = group ? _('You may close the milestone now.') : _('Navigate to the project to close the milestone.')
 
 = render_if_exists 'shared/milestones/burndown', milestone: milestone, project: @project