diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-02-17 16:31:14 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-02-17 16:31:14 +0100 |
| commit | 42c2064a36f41f83501d9c8183fe93733da7ede6 (patch) | |
| tree | 98fae45a46a8c9cf98412f225eb03c743004bde3 | |
| parent | 28d42a33f3385b57660906d4ca35e96d56785d7e (diff) | |
| download | gitlab-ce-42c2064a36f41f83501d9c8183fe93733da7ede6.tar.gz | |
Sort line notes used in parallel diff by created_at
Fixes #13464.
| -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) |