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/assets/javascripts/issue_show | |
parent | e29c0da8c567fa884d8ceca05346fa7635e1eb8d (diff) | |
download | gitlab-ce-83397ed0713d7d1c950f973b28ed4df7c8cc7185.tar.gz |
Fix broken tests due to bad conflict resolution
Diffstat (limited to 'app/assets/javascripts/issue_show')
-rw-r--r-- | app/assets/javascripts/issue_show/components/fields/description.vue | 2 |
1 files changed, 1 insertions, 1 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> |