Merge branch '233690-replace-bootstrap-alerts-app/views/projects/blob/edit.html.haml' into 'master'

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

Closes #233690

See merge request gitlab-org/gitlab!41298

app/views/projects/blob/edit.html.haml

@@ -2,10 +2,12 @@
 - page_title _("Edit"), @blob.path, @ref
 
 - if @conflict
-  .alert.alert-danger
-    Someone edited the file the same time you did. Please check out
-    = link_to "the file", project_blob_path(@project, tree_join(@branch_name, @file_path)), target: "_blank", rel: 'noopener noreferrer'
-    and make sure your changes will not unintentionally remove theirs.
+  .gl-alert.gl-alert-danger.gl-mb-5.gl-mt-5
+    = sprite_icon('error', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
+    .gl-alert-body
+      Someone edited the file the same time you did. Please check out
+      = link_to "the file", project_blob_path(@project, tree_join(@branch_name, @file_path)), target: "_blank", rel: 'noopener noreferrer', class: 'gl-link'
+      and make sure your changes will not unintentionally remove theirs.
 
 - if editing_ci_config? && show_web_ide_alert?
   #js-suggest-web-ide-ci{ data: { dismiss_endpoint: user_callouts_path, feature_id: UserCalloutsHelper::WEB_IDE_ALERT_DISMISSED, edit_path: ide_edit_path } }

changelogs/unreleased/233690-replace-bootstrap-alerts-app-views-projects-blob-edit-html-haml.yml

+---
+title: Replace bootstrap alerts in app/views/projects/blob/edit.html.haml
+merge_request: 41298
+author: Gilang Gumilar
+type: changed