Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
83397ed0
Commit
83397ed0
authored
Jun 13, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix broken tests due to bad conflict resolution
parent
e29c0da8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
app/assets/javascripts/issue_show/components/fields/description.vue
.../javascripts/issue_show/components/fields/description.vue
+1
-1
app/assets/javascripts/notes/components/comment_form.vue
app/assets/javascripts/notes/components/comment_form.vue
+1
-1
app/assets/javascripts/notes/components/note_form.vue
app/assets/javascripts/notes/components/note_form.vue
+1
-1
No files found.
app/assets/javascripts/issue_show/components/fields/description.vue
View file @
83397ed0
...
...
@@ -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>
...
...
app/assets/javascripts/notes/components/comment_form.vue
View file @
83397ed0
...
...
@@ -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()"
>
...
...
app/assets/javascripts/notes/components/note_form.vue
View file @
83397ed0
...
...
@@ -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()"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment