diff options
| author | Phil Hughes <me@iamphill.com> | 2018-07-10 13:53:47 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-07-10 13:53:47 +0000 |
| commit | d01e5a04ccee4659fdab8f381a12201daa1c8cb5 (patch) | |
| tree | 24c051930b7b8341fc174426fb89fb012bd98e1b | |
| parent | 7358211ece27ccc9b6653b73efd9cada8bbb254a (diff) | |
| parent | 191d8ecff6ece1a7f57b5d033cbe7405e4e06933 (diff) | |
| download | gitlab-ce-d01e5a04ccee4659fdab8f381a12201daa1c8cb5.tar.gz | |
Merge branch 'revert-3755d828' into 'master'
Revert "Merge branch 'fix-inconsistent-cancel-button' into 'master'"
See merge request gitlab-org/gitlab-ce!20525
| -rw-r--r-- | app/assets/javascripts/notes/components/note_form.vue | 2 | ||||
| -rw-r--r-- | app/views/shared/notes/_form.html.haml | 2 | ||||
| -rw-r--r-- | spec/features/projects/commit/comments/user_adds_comment_spec.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/notes/components/note_form.vue b/app/assets/javascripts/notes/components/note_form.vue index 963e3a37b39..26482a02e00 100644 --- a/app/assets/javascripts/notes/components/note_form.vue +++ b/app/assets/javascripts/notes/components/note_form.vue @@ -200,7 +200,7 @@ js-autosize markdown-area js-vue-issue-note-form js-vue-textarea" class="btn btn-cancel note-edit-cancel js-close-discussion-note-form" type="button" @click="cancelHandler()"> - {{ __('Discard draft') }} + Cancel </button> </div> </form> 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 diff --git a/spec/features/projects/commit/comments/user_adds_comment_spec.rb b/spec/features/projects/commit/comments/user_adds_comment_spec.rb index 53866c32c69..6397df086a7 100644 --- a/spec/features/projects/commit/comments/user_adds_comment_spec.rb +++ b/spec/features/projects/commit/comments/user_adds_comment_spec.rb @@ -62,7 +62,7 @@ describe "User adds a comment on a commit", :js do click_diff_line(sample_commit.line_code) expect(page).to have_css(".js-temp-notes-holder form.new-note") - .and have_css(".js-close-discussion-note-form", text: "Discard draft") + .and have_css(".js-close-discussion-note-form", text: "Cancel") # The `Cancel` button closes the current form. The page should not have any open forms after that. find(".js-close-discussion-note-form").click |