diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-12 15:33:20 +0300 |
|---|---|---|
| committer | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-12 15:33:20 +0300 |
| commit | d94b162129ed7d3131efe7822a4f0c6b4991fb8e (patch) | |
| tree | 3a9acdf8cd51c3a927ba233c8efe61834c946dcc /app/views/shared | |
| parent | fb318d2362c04e82096d4e733f473a135fadf631 (diff) | |
| parent | 88808a1fd4f1b8ebfa90bf5a85cf618065140aa7 (diff) | |
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/views/shared')
| -rw-r--r-- | app/views/shared/form_elements/_description.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/notes/_edit_form.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/notes/_form.html.haml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/views/shared/form_elements/_description.html.haml b/app/views/shared/form_elements/_description.html.haml index e5dfa7dbf71..25df2fe5cd6 100644 --- a/app/views/shared/form_elements/_description.html.haml +++ b/app/views/shared/form_elements/_description.html.haml @@ -16,7 +16,7 @@ = render layout: 'projects/md_preview', locals: { url: preview_url, referenced_users: true } do = render 'projects/zen', f: form, attr: :description, classes: 'note-textarea qa-issuable-form-description', - placeholder: "Write a comment or drag your files here...", + placeholder: "Write a comment or drag your files here…", supports_quick_actions: supports_quick_actions = render 'shared/notes/hints', supports_quick_actions: supports_quick_actions .clearfix diff --git a/app/views/shared/notes/_edit_form.html.haml b/app/views/shared/notes/_edit_form.html.haml index 8923e5602a4..71a5b94e958 100644 --- a/app/views/shared/notes/_edit_form.html.haml +++ b/app/views/shared/notes/_edit_form.html.haml @@ -3,7 +3,7 @@ = hidden_field_tag :target_id, '', class: 'js-form-target-id' = hidden_field_tag :target_type, '', class: 'js-form-target-type' = render layout: 'projects/md_preview', locals: { url: preview_markdown_path(project), referenced_users: true } do - = render 'projects/zen', attr: 'note[note]', classes: 'note-textarea js-note-text js-task-list-field', placeholder: "Write a comment or drag your files here..." + = render 'projects/zen', attr: 'note[note]', classes: 'note-textarea js-note-text js-task-list-field', placeholder: "Write a comment or drag your files here…" = render 'shared/notes/hints' .note-form-actions.clearfix diff --git a/app/views/shared/notes/_form.html.haml b/app/views/shared/notes/_form.html.haml index 71c0d740bc8..c360f1ffe2a 100644 --- a/app/views/shared/notes/_form.html.haml +++ b/app/views/shared/notes/_form.html.haml @@ -29,7 +29,7 @@ = render 'projects/zen', f: f, attr: :note, classes: 'note-textarea js-note-text', - placeholder: "Write a comment or drag your files here...", + placeholder: "Write a comment or drag your files here…", supports_quick_actions: supports_quick_actions, supports_autocomplete: supports_autocomplete = render 'shared/notes/hints', supports_quick_actions: supports_quick_actions |