diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-02-17 15:57:34 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-02-17 15:57:34 +0000 |
commit | 14488f79b5d169397799292c7fd611e34064f3c4 (patch) | |
tree | 439c8ba0c75c81cccd0e27bcfc5f090979f74fe3 | |
parent | 6483a4c7b1033f357eda3436bc7054c59e2f9b3f (diff) | |
parent | 42c2064a36f41f83501d9c8183fe93733da7ede6 (diff) | |
download | gitlab-ce-14488f79b5d169397799292c7fd611e34064f3c4.tar.gz |
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
-rw-r--r-- | app/helpers/diff_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/diff_helper.rb b/app/helpers/diff_helper.rb index f9bacc8ba45..6a3ab3ea40a 100644 --- 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) |