kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix broken tests due to bad conflict resolution

This commit is contained in:
Filipa Lacerda 2018-06-13 12:05:52 +01:00
parent e29c0da8c5
commit 83397ed071
No known key found for this signature in database
GPG Key ID: 9CA3FDE4D1E2F1C8
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/issue_show/components/fields/description.vue
View File

@ -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>

2
app/assets/javascripts/notes/components/comment_form.vue
View File

@ -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()">

2
app/assets/javascripts/notes/components/note_form.vue
View File

@ -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()"