summaryrefslogtreecommitdiff
path: root/app/views/shared/form_elements
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-15 12:06:06 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-15 12:06:06 +0000
commitfc96671f817239041ba2747af835a8d5d9aa3739 (patch)
tree19c7f650c869033760850b0d0edd4fb0a10968c4 /app/views/shared/form_elements
parent3d13802bc2c9400ea33defdd43bff6d904ee9c4d (diff)
downloadgitlab-ce-fc96671f817239041ba2747af835a8d5d9aa3739.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/shared/form_elements')
-rw-r--r--app/views/shared/form_elements/_apply_template_warning.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/form_elements/_apply_template_warning.html.haml b/app/views/shared/form_elements/_apply_template_warning.html.haml
index 9027264d221..09ca59a520c 100644
--- a/app/views/shared/form_elements/_apply_template_warning.html.haml
+++ b/app/views/shared/form_elements/_apply_template_warning.html.haml
@@ -2,7 +2,7 @@
.offset-sm-2.col-sm-10
.warning_message.mb-0{ role: 'alert' }
- %btn.js-close-btn.close{ type: "button", "aria-hidden": true, "aria-label": _("Close") }
+ %btn.js-close-btn.js-dismiss-btn.close{ type: "button", "aria-hidden": true, "aria-label": _("Close") }
= sprite_icon("close")
%p
@@ -10,5 +10,5 @@
%button.js-override-template.btn.btn-warning.mr-2{ type: 'button' }
= _("Apply template")
- %button.js-cancel-btn.btn.btn-inverted{ type: 'button' }
+ %button.js-close-btn.js-cancel-btn.btn.btn-inverted{ type: 'button' }
= _("Cancel")