diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-01-03 23:29:30 +0100 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2018-01-03 23:29:30 +0100 |
| commit | f54bddb20ad7575e2276378e65301405ea427f4d (patch) | |
| tree | 1028f10ce6311963c2fc7f09d04977f8a0f5fb26 | |
| parent | 4256d5a7beadd0cbcf81afcc1a0ea1d5ed30028b (diff) | |
| download | gitlab-ce-f54bddb20ad7575e2276378e65301405ea427f4d.tar.gz | |
MRNotesRefactor: Fix haml linter and karma spec.
| -rw-r--r-- | app/assets/javascripts/notes/components/noteable_note.vue | 2 | ||||
| -rw-r--r-- | app/views/shared/notes/_notes_with_form.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue index 9f6ee3aff46..9946996c6c9 100644 --- a/app/assets/javascripts/notes/components/noteable_note.vue +++ b/app/assets/javascripts/notes/components/noteable_note.vue @@ -125,7 +125,7 @@ // we need to do this to prevent noteForm inconsistent content warning // this is something we intentionally do so we need to recover the content this.note.note = noteText; - this.$refs.noteBody.$refs.noteForm.note = noteText; + this.$refs.noteBody.$refs.noteForm.note.note = noteText; }, }, created() { diff --git a/app/views/shared/notes/_notes_with_form.html.haml b/app/views/shared/notes/_notes_with_form.html.haml index 129eeec7c1d..e27b875b817 100644 --- a/app/views/shared/notes/_notes_with_form.html.haml +++ b/app/views/shared/notes/_notes_with_form.html.haml @@ -9,7 +9,7 @@ = render 'shared/notes/edit_form', project: @project - if can_create_note? - %ul.notes.notes-form.timeline{:class => ('hidden' if has_vue_discussions_cookie)} + %ul.notes.notes-form.timeline{ :class => ('hidden' if has_vue_discussions_cookie) } %li.timeline-entry .timeline-entry-inner .flash-container.timeline-content |