diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-04-18 16:29:13 +0300 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-04-18 16:29:13 +0300 |
| commit | d337d27e1c9b838a17ed3545f3690419c088c50f (patch) | |
| tree | 072abdb5a390e3bdbf9960a14bcd139443d0dfe0 /app/views/projects/notes | |
| parent | 4d5d61945770378d6c0edbdfe0e88d43c5129b03 (diff) | |
| parent | 167fa5c459f275e17a4d8f7155f15004cc29c28d (diff) | |
Merge branch 'print-style' into 'master'
Print style
[test.pdf](/uploads/0dab5c1b2d0c4d0cd7e8930e9b660a9f/test.pdf)
Closes #14201
See merge request !3784
Diffstat (limited to 'app/views/projects/notes')
| -rw-r--r-- | app/views/projects/notes/_notes_with_form.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/notes/_notes_with_form.html.haml b/app/views/projects/notes/_notes_with_form.html.haml index cc42aab5c52..1c39ce897a3 100644 --- a/app/views/projects/notes/_notes_with_form.html.haml +++ b/app/views/projects/notes/_notes_with_form.html.haml @@ -1,6 +1,6 @@ %ul#notes-list.notes.main-notes-list.timeline = render "projects/notes/notes" -%ul.notes.timeline +%ul.notes.notes-form.timeline %li.timeline-entry - if can? current_user, :create_note, @project .timeline-icon.hidden-xs.hidden-sm |