Put empty note edit form to correct place.

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'

app/views/projects/notes/_notes_with_form.html.haml

 %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