From bc3187f6d968f954c7998b66a6595273f9ecf5e1 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 5 Apr 2022 18:09:00 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/views/shared/issuable/_form.html.haml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'app/views/shared/issuable/_form.html.haml')

diff --git a/app/views/shared/issuable/_form.html.haml b/app/views/shared/issuable/_form.html.haml
index 3f6e7a6fb32..e0d5f738273 100644
--- a/app/views/shared/issuable/_form.html.haml
+++ b/app/views/shared/issuable/_form.html.haml
@@ -6,10 +6,9 @@
 = form_errors(issuable)
 
 - if @conflict
-  = render 'shared/global_alert',
-    variant: :danger,
+  = render Pajamas::AlertComponent.new(variant: :danger,
     dismissible: false,
-    alert_class: 'gl-mb-5' do
+    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
-- 
cgit v1.2.1