diff options
| author | Andreas Kämmerle <andreas.kaemmerle@gmail.com> | 2018-06-07 14:44:30 +0200 |
|---|---|---|
| committer | Andreas Kämmerle <andreas.kaemmerle@gmail.com> | 2018-06-07 14:44:30 +0200 |
| commit | 21bcca252eddddcb6fd5e294bb4346c6548417f6 (patch) | |
| tree | 9ccfa276101ea71823e5e53d638278e73470f105 | |
| parent | df326d061e23a7d5eb2618e542c193d4aef79c1a (diff) | |
| download | gitlab-ce-consolidate-cancel-button-texts.tar.gz | |
Fix inconsistent Cancel button textconsolidate-cancel-button-texts
| -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 c59a2e7a406..5a0e9853d89 100644 --- a/app/assets/javascripts/notes/components/note_form.vue +++ b/app/assets/javascripts/notes/components/note_form.vue @@ -199,7 +199,7 @@ js-autosize markdown-area js-vue-issue-note-form js-vue-textarea" @click="cancelHandler()" class="btn btn-cancel note-edit-cancel" type="button"> - Cancel + Discard draft </button> </div> </form> diff --git a/app/views/shared/notes/_form.html.haml b/app/views/shared/notes/_form.html.haml index 71c0d740bc8..30fb75cce39 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: "Cancel" } } + %a.btn.btn-cancel.js-note-discard{ role: "button", data: {cancel_text: "Discard draft" } } 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 6397df086a7..53866c32c69 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: "Cancel") + .and have_css(".js-close-discussion-note-form", text: "Discard draft") # The `Cancel` button closes the current form. The page should not have any open forms after that. find(".js-close-discussion-note-form").click |