diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-11-14 23:15:41 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-01-04 23:37:54 +0300 |
| commit | a1d1a414791ab7f6bee9412b93d2ba7365191277 (patch) | |
| tree | eb42231d98967ac7463e12c5b9199aa7b2b37aff | |
| parent | 3e779f07b29aafcb8a143134723415fa8304ba5e (diff) | |
| download | gitlab-ce-a1d1a414791ab7f6bee9412b93d2ba7365191277.tar.gz | |
Put empty note edit form to correct place.
| -rw-r--r-- | app/views/projects/notes/_notes.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/notes/_notes_with_form.html.haml | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/views/projects/notes/_notes.html.haml b/app/views/projects/notes/_notes.html.haml index a57c2d0fc4c..022578bd6db 100644 --- a/app/views/projects/notes/_notes.html.haml +++ b/app/views/projects/notes/_notes.html.haml @@ -6,5 +6,3 @@ = render 'discussions/discussion', discussion: discussion - else = render partial: "projects/notes/note", collection: @notes, as: :note - -= render 'projects/notes/edit_form' diff --git a/app/views/projects/notes/_notes_with_form.html.haml b/app/views/projects/notes/_notes_with_form.html.haml index 00b62a595ff..f01bcfac898 100644 --- a/app/views/projects/notes/_notes_with_form.html.haml +++ b/app/views/projects/notes/_notes_with_form.html.haml @@ -1,5 +1,8 @@ %ul#notes-list.notes.main-notes-list.timeline = render "projects/notes/notes" + += render 'projects/notes/edit_form' + %ul.notes.notes-form.timeline %li.timeline-entry .flash-container.timeline-content |