Commit 14488f79 authored by Douwe Maan's avatar Douwe Maan

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
parents 6483a4c7 42c2064a
...@@ -69,7 +69,7 @@ module DiffHelper ...@@ -69,7 +69,7 @@ module DiffHelper
end end
def line_comments 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 end
def organize_comments(type_left, type_right, line_code_left, line_code_right) def organize_comments(type_left, type_right, line_code_left, line_code_right)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment