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
a5838524
Commit
a5838524
authored
Oct 29, 2012
by
Riyad Preukschas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add discussions for merge requests to notes controller
parent
9b919939
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
4 deletions
+35
-4
app/controllers/notes_controller.rb
app/controllers/notes_controller.rb
+35
-4
No files found.
app/controllers/notes_controller.rb
View file @
a5838524
...
...
@@ -6,10 +6,15 @@ class NotesController < ProjectResourceController
respond_to
:js
def
index
notes
@notes
=
Notes
::
LoadContext
.
new
(
project
,
current_user
,
params
).
execute
if
params
[
:target_type
]
==
"merge_request"
@mixed_targets
=
true
@main_target_type
=
params
[
:target_type
].
camelize
@discussions
=
discussions_from_notes
@has_diff
=
true
elsif
params
[
:target_type
]
==
"commit"
@has_diff
=
true
end
respond_with
(
@notes
)
...
...
@@ -40,7 +45,33 @@ class NotesController < ProjectResourceController
protected
def
notes
@notes
=
Notes
::
LoadContext
.
new
(
project
,
current_user
,
params
).
execute
def
discussion_notes_for
(
note
)
@notes
.
select
do
|
other_note
|
note
.
discussion_id
==
other_note
.
discussion_id
end
end
def
discussions_from_notes
discussion_ids
=
[]
discussions
=
[]
@notes
.
each
do
|
note
|
next
if
discussion_ids
.
include?
(
note
.
discussion_id
)
# don't group notes for the main target
if
for_main_target?
(
note
)
discussions
<<
[
note
]
else
discussions
<<
discussion_notes_for
(
note
)
discussion_ids
<<
note
.
discussion_id
end
end
discussions
end
# Helps to distinguish e.g. commit notes in mr notes list
def
for_main_target?
(
note
)
!
@mixed_targets
||
(
@main_target_type
==
note
.
noteable_type
&&
!
note
.
for_diff_line?
)
end
end
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