diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-05 18:09:00 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-05 18:09:00 +0000 |
| commit | bc3187f6d968f954c7998b66a6595273f9ecf5e1 (patch) | |
| tree | 741d17bfcaebe80247f90e7529ffc397e071d3ff /app/views/shared/issuable/_form.html.haml | |
| parent | 4001deba7325ebf380f0d60038107e56a3c7e2c3 (diff) | |
| download | gitlab-ce-bc3187f6d968f954c7998b66a6595273f9ecf5e1.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/shared/issuable/_form.html.haml')
| -rw-r--r-- | app/views/shared/issuable/_form.html.haml | 5 |
1 files changed, 2 insertions, 3 deletions
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 |