Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
42c2064a
Commit
42c2064a
authored
Feb 17, 2016
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Sort line notes used in parallel diff by created_at
Fixes #13464.
parent
28d42a33
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/helpers/diff_helper.rb
app/helpers/diff_helper.rb
+1
-1
No files found.
app/helpers/diff_helper.rb
View file @
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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment