@@ -186,6 +186,11 @@ class MergeRequest < ActiveRecord::Base
patch_path
end
defmr_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)