diff --git a/app/views/commits/_text_file.html.haml b/app/views/commits/_text_file.html.haml
index 0f6210f..5dc8dbd 100644
--- a/app/views/commits/_text_file.html.haml
+++ b/app/views/commits/_text_file.html.haml
@@ -18,9 +18,9 @@
         %td.line_content{class: "noteable_line #{type} #{line_code}", "line_code" => line_code}= raw "#{line}  "
 
         - if @comments_allowed
-          - comments = @line_notes.select { |n| n.line_code == line_code }.sort_by(&:created_at).reverse
+          - comments = @line_notes.select { |n| n.line_code == line_code }.sort_by(&:created_at)
           - unless comments.empty?
             - comments.each_with_index do |note, i|
-              = render "notes/reply_button", line_code: line_code if i.zero?
               = render "notes/per_line_show", note: note
               - @line_notes.reject!{ |n| n == note }
+            = render "notes/reply_button", line_code: line_code
diff --git a/app/views/notes/_create_common.js.haml b/app/views/notes/_create_common.js.haml
index ce67858..0a00bd4 100644
--- a/app/views/notes/_create_common.js.haml
+++ b/app/views/notes/_create_common.js.haml
@@ -9,5 +9,5 @@
 
 - else
   :plain
-    $(".note-form-holder").replaceWith("#{escape_javascript(render('form'))}");
+    $(".note-form-holder").replaceWith("#{escape_javascript(render 'form')}");
 
diff --git a/app/views/notes/_per_line_show.html.haml b/app/views/notes/_per_line_show.html.haml
index cf1769c..9d5a31a 100644
--- a/app/views/notes/_per_line_show.html.haml
+++ b/app/views/notes/_per_line_show.html.haml
@@ -1,5 +1,5 @@
 %tr.line_notes_row
   %td{colspan: 3}
     %ul
-      = render partial: "notes/show", locals: {note: note}
+      = render "notes/show", note: note
 
--
libgit2 0.21.2