Commit 83397ed0 authored by Filipa Lacerda's avatar Filipa Lacerda

Fix broken tests due to bad conflict resolution

parent e29c0da8
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
class="note-textarea js-gfm-input js-autosize markdown-area" class="note-textarea js-gfm-input js-autosize markdown-area"
data-supports-quick-actions="false" data-supports-quick-actions="false"
aria-label="Description" 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.meta.enter="updateIssuable"
@keydown.ctrl.enter="updateIssuable"> @keydown.ctrl.enter="updateIssuable">
</textarea> </textarea>
......
...@@ -361,7 +361,7 @@ Please check your network connection and try again.`; ...@@ -361,7 +361,7 @@ Please check your network connection and try again.`;
js-gfm-input js-autosize markdown-area js-vue-textarea" js-gfm-input js-autosize markdown-area js-vue-textarea"
data-supports-quick-actions="true" data-supports-quick-actions="true"
aria-label="Description" 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.up="editCurrentUserLastNote()"
@keydown.meta.enter="handleSave()" @keydown.meta.enter="handleSave()"
@keydown.ctrl.enter="handleSave()"> @keydown.ctrl.enter="handleSave()">
......
...@@ -173,7 +173,7 @@ export default { ...@@ -173,7 +173,7 @@ export default {
class="note-textarea js-gfm-input class="note-textarea js-gfm-input
js-autosize markdown-area js-vue-issue-note-form js-vue-textarea" js-autosize markdown-area js-vue-issue-note-form js-vue-textarea"
aria-label="Description" 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.meta.enter="handleUpdate()"
@keydown.ctrl.enter="handleUpdate()" @keydown.ctrl.enter="handleUpdate()"
@keydown.up="editMyLastNote()" @keydown.up="editMyLastNote()"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment