@@ -204,7 +204,7 @@ class MergeRequest < ActiveRecord::Base
...
@@ -204,7 +204,7 @@ class MergeRequest < ActiveRecord::Base
defmr_and_commit_notes
defmr_and_commit_notes
commit_ids=commits.map(&:id)
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)