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

Split commit_id and noteable_id for Note

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-12-18 20:02:00 +02:00
parent aa8d4d9fea
commit 9ada678819
11 changed files with 54 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/merge_request.rb
View file

@ -204,7 +204,7 @@ class MergeRequest < ActiveRecord::Base
def mr_and_commit_notes
commit_ids = commits.map(&:id)
Note.where("(noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR (noteable_type = 'Commit' AND noteable_id IN (:commit_ids))", mr_id: id, commit_ids: commit_ids)
Note.where("(noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR (noteable_type = 'Commit' AND commit_id IN (:commit_ids))", mr_id: id, commit_ids: commit_ids)
end
# Returns the raw diff for this merge request