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

Merge branch 'per_line_comment'

Browse source 
Conflicts:
	app/assets/stylesheets/projects.css.scss
This commit is contained in:
Dmitriy Zaporozhets 2012-01-12 00:42:17 +02:00
commit 6cf000ff52
18 changed files with 165 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/commits_controller.rb
View file

@ -27,6 +27,8 @@ class CommitsController < ApplicationController
@notes = project.commit_notes(@commit).fresh.limit(20)
@note = @project.build_commit_note(@commit)
@line_notes = project.commit_line_notes(@commit)
respond_to do |format|
format.html
format.js { respond_with_notes }