diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2018-02-28 00:10:43 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2018-02-28 00:10:43 +0000 |
| commit | 059ab73b8eae3a546d0a19fe99ef0c52df5fac01 (patch) | |
| tree | b24d4162072c0099147fcdb4f19f95511689ff6e /app/views/shared/notes/_notes_with_form.html.haml | |
| parent | 0be4a77d0012613f960c4177f53101c46de2899c (diff) | |
| download | gitlab-ce-059ab73b8eae3a546d0a19fe99ef0c52df5fac01.tar.gz | |
Render MR Notes with Vue with behind a cookie
Diffstat (limited to 'app/views/shared/notes/_notes_with_form.html.haml')
| -rw-r--r-- | app/views/shared/notes/_notes_with_form.html.haml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/shared/notes/_notes_with_form.html.haml b/app/views/shared/notes/_notes_with_form.html.haml index b3f865c5b47..0ceca367883 100644 --- a/app/views/shared/notes/_notes_with_form.html.haml +++ b/app/views/shared/notes/_notes_with_form.html.haml @@ -1,13 +1,14 @@ - issuable = @issue || @merge_request - discussion_locked = issuable&.discussion_locked? -%ul#notes-list.notes.main-notes-list.timeline - = render "shared/notes/notes" +- unless has_vue_discussions_cookie? + %ul#notes-list.notes.main-notes-list.timeline + = render "shared/notes/notes" = render 'shared/notes/edit_form', project: @project - if can_create_note? - %ul.notes.notes-form.timeline + %ul.notes.notes-form.timeline{ :class => ('hidden' if has_vue_discussions_cookie?) } %li.timeline-entry .timeline-entry-inner .flash-container.timeline-content |