Merge branch 'revert-3755d828' into 'master'

Revert "Merge branch 'fix-inconsistent-cancel-button' into 'master'"

See merge request gitlab-org/gitlab-ce!20525

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>

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

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