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

Make notes for merge requests include commit notes and add helpers

Browse source
This commit is contained in:
Riyad Preukschas 2012-10-10 12:06:30 +02:00
parent dda852a0d5
commit 3f72af9994
4 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/note.rb
View file

@ -49,7 +49,7 @@ class Note < ActiveRecord::Base
end
def target
if noteable_type == "Commit"
if commit?
project.commit(noteable_id)
else
noteable
@ -82,6 +82,10 @@ class Note < ActiveRecord::Base
noteable_type == "Commit"
end
def line_note?
line_code.present?
end
def commit_author
@commit_author ||=
project.users.find_by_email(target.author_email) ||