Update gl-alert markup in file

1c91ae4d · Marvin Karegyeya · Vitaly Slobodin · 32006887 · 1c91ae4d
Commit 1c91ae4d authored Jun 29, 2021 by Marvin Karegyeya Committed by Vitaly Slobodin Jun 29, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 5 deletions

app/views/shared/issuable/_form.html.haml app/views/shared/issuable/_form.html.haml +10 -5

No files found.
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -6,11 +6,16 @@
 = form_errors(issuable)
 - if @conflict
-  .gl-alert.gl-alert-danger.gl-mb-5
+  = render 'shared/global_alert',
-    Someone edited the #{issuable.class.model_name.human.downcase} the same time you did.
+    variant: :danger,
-    Please check out
+    dismissible: false,
-    = link_to "the #{issuable.class.model_name.human.downcase}", polymorphic_path([@project, issuable]), target: "_blank", rel: 'noopener noreferrer'
+    is_contained: true,
-    and make sure your changes will not unintentionally remove theirs
+    alert_class: 'gl-mb-5' do
+    .gl-alert-body
+      Someone edited the #{issuable.class.model_name.human.downcase} the same time you did.
+      Please check out
+      = link_to "the #{issuable.class.model_name.human.downcase}", polymorphic_path([@project, issuable]), target: "_blank", rel: 'noopener noreferrer'
+      and make sure your changes will not unintentionally remove theirs
 = render 'shared/issuable/form/branch_chooser', issuable: issuable, form: form