summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorWinnie Hellmann <winnie@gitlab.com>2018-07-10 12:38:15 +0000
committerWinnie Hellmann <winnie@gitlab.com>2018-07-10 12:38:15 +0000
commit191d8ecff6ece1a7f57b5d033cbe7405e4e06933 (patch)
tree8aece9650c5041478c29073e110076610059631b /app/views
parent6152d7a33e177f8b656f104a7e7d93c3a5562394 (diff)
downloadgitlab-ce-191d8ecff6ece1a7f57b5d033cbe7405e4e06933.tar.gz
Revert "Merge branch 'fix-inconsistent-cancel-button' into 'master'"
This reverts merge request !20140
Diffstat (limited to 'app/views')
-rw-r--r--app/views/shared/notes/_form.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/notes/_form.html.haml b/app/views/shared/notes/_form.html.haml
index 6b2715b47a7..c360f1ffe2a 100644
--- a/app/views/shared/notes/_form.html.haml
+++ b/app/views/shared/notes/_form.html.haml
@@ -40,5 +40,5 @@
= yield(:note_actions)
- %a.btn.btn-cancel.js-note-discard{ role: "button", data: {cancel_text: "Discard draft" } }
+ %a.btn.btn-cancel.js-note-discard{ role: "button", data: {cancel_text: "Cancel" } }
Discard draft