diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-06-13 12:05:52 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-13 12:05:52 +0100 |
| commit | 83397ed0713d7d1c950f973b28ed4df7c8cc7185 (patch) | |
| tree | db416782557cd1e989eeca93688581d1e8de422b /app | |
| parent | e29c0da8c567fa884d8ceca05346fa7635e1eb8d (diff) | |
| download | gitlab-ce-83397ed0713d7d1c950f973b28ed4df7c8cc7185.tar.gz | |
Fix broken tests due to bad conflict resolution
Diffstat (limited to 'app')
3 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/issue_show/components/fields/description.vue b/app/assets/javascripts/issue_show/components/fields/description.vue index a4556e66046..5f58f671c73 100644 --- a/app/assets/javascripts/issue_show/components/fields/description.vue +++ b/app/assets/javascripts/issue_show/components/fields/description.vue @@ -58,7 +58,7 @@ class="note-textarea js-gfm-input js-autosize markdown-area" data-supports-quick-actions="false" aria-label="Description" - placeholder="Write a comment or drag your files here..." + placeholder="Write a comment or drag your files here…" @keydown.meta.enter="updateIssuable" @keydown.ctrl.enter="updateIssuable"> </textarea> diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue index dbe398cc694..ad6dd3d9a09 100644 --- a/app/assets/javascripts/notes/components/comment_form.vue +++ b/app/assets/javascripts/notes/components/comment_form.vue @@ -361,7 +361,7 @@ Please check your network connection and try again.`; js-gfm-input js-autosize markdown-area js-vue-textarea" data-supports-quick-actions="true" aria-label="Description" - placeholder="Write a comment or drag your files here..." + placeholder="Write a comment or drag your files here…" @keydown.up="editCurrentUserLastNote()" @keydown.meta.enter="handleSave()" @keydown.ctrl.enter="handleSave()"> diff --git a/app/assets/javascripts/notes/components/note_form.vue b/app/assets/javascripts/notes/components/note_form.vue index a752f634c07..7254ef3357d 100644 --- a/app/assets/javascripts/notes/components/note_form.vue +++ b/app/assets/javascripts/notes/components/note_form.vue @@ -173,7 +173,7 @@ export default { class="note-textarea js-gfm-input js-autosize markdown-area js-vue-issue-note-form js-vue-textarea" aria-label="Description" - placeholder="Write a comment or drag your files here..." + placeholder="Write a comment or drag your files here…" @keydown.meta.enter="handleUpdate()" @keydown.ctrl.enter="handleUpdate()" @keydown.up="editMyLastNote()" |