Merge branch 'fix/13464-order-line-notes-create_at-in-parallel-diff-view' into 'master'

Sort line notes used in parallel diff by created_at Fixes #13464. See merge request !2858

Merge branch 'fix/13464-order-line-notes-create_at-in-parallel-diff-view' into 'master'
14488f79 · Douwe Maan · 6483a4c7 · 42c2064a · 14488f79
Commit 14488f79 authored Feb 17, 2016 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

diff_helper.rb app/helpers/diff_helper.rb +1 -1

No files found.
--- a/app/helpers/diff_helper.rb
+++ b/app/helpers/diff_helper.rb
@@ -69,7 +69,7 @@ module DiffHelper
  end

  def line_comments
-    @line_comments ||= @line_notes.select(&:active?).group_by(&:line_code)
+    @line_comments ||= @line_notes.select(&:active?).sort_by(&:created_at).group_by(&:line_code)
  end

  def organize_comments(type_left, type_right, line_code_left, line_code_right)