diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2018-07-10 15:38:15 +0300 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2018-07-10 15:38:15 +0300 |
| commit | 191d8ecff6ece1a7f57b5d033cbe7405e4e06933 (patch) | |
| tree | 8aece9650c5041478c29073e110076610059631b /app/assets/javascripts/notes/components/note_form.vue | |
| parent | 6152d7a33e177f8b656f104a7e7d93c3a5562394 (diff) | |
Revert "Merge branch 'fix-inconsistent-cancel-button' into 'master'"
This reverts merge request !20140
Diffstat (limited to 'app/assets/javascripts/notes/components/note_form.vue')
| -rw-r--r-- | app/assets/javascripts/notes/components/note_form.vue | 2 |
1 files changed, 1 insertions, 1 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> |