diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-12 12:33:20 +0000 |
|---|---|---|
| committer | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-12 12:33:20 +0000 |
| commit | d94b162129ed7d3131efe7822a4f0c6b4991fb8e (patch) | |
| tree | 3a9acdf8cd51c3a927ba233c8efe61834c946dcc /app/assets | |
| parent | fb318d2362c04e82096d4e733f473a135fadf631 (diff) | |
| parent | 88808a1fd4f1b8ebfa90bf5a85cf618065140aa7 (diff) | |
| download | gitlab-ce-d94b162129ed7d3131efe7822a4f0c6b4991fb8e.tar.gz | |
Merge branch 'replace-dots-with-ellipsis' into 'master'
Replace ... with ellipsis in placeholders
See merge request gitlab-org/gitlab-ce!19627
Diffstat (limited to 'app/assets')
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 d9fa2764d65..33110d27050 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 @@ v-model="formState.description" ref="textarea" slot="textarea" - 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 72d7e22fba0..17943d7abfb 100644 --- a/app/assets/javascripts/notes/components/comment_form.vue +++ b/app/assets/javascripts/notes/components/comment_form.vue @@ -361,7 +361,7 @@ js-gfm-input js-autosize markdown-area js-vue-textarea" ref="textarea" slot="textarea" :disabled="isSubmitting" - 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 c59a2e7a406..93b66986958 100644 --- a/app/assets/javascripts/notes/components/note_form.vue +++ b/app/assets/javascripts/notes/components/note_form.vue @@ -173,7 +173,7 @@ js-autosize markdown-area js-vue-issue-note-form js-vue-textarea" v-model="updatedNoteBody" ref="textarea" slot="textarea" - 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()" |