deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix parameter passing and wording for per line notes

Browse source
This commit is contained in:
Riyad Preukschas 2012-10-29 15:55:37 +01:00
parent b91d680257
commit 9b919939a3
9 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/commit_controller.rb
View file

@ -17,7 +17,9 @@ class CommitController < ProjectResourceController
@note = result[:note]
@line_notes = result[:line_notes]
@notes_count = result[:notes_count]
@comments_allowed = true
@comments_allowed = @reply_allowed = true
@comments_target = { noteable_type: 'Commit',
noteable_id: @commit.id }
respond_to do |format|
format.html do

4
app/controllers/merge_requests_controller.rb
View file

@ -34,7 +34,9 @@ class MergeRequestsController < ProjectResourceController
@diffs = @merge_request.diffs
@commit = @merge_request.last_commit
@comments_allowed = true
@comments_allowed = @reply_allowed = true
@comments_target = { noteable_type: 'MergeRequest',
noteable_id: @merge_request.id }
@line_notes = @merge_request.notes.where("line_code is not null")
end