Fix bugs when discussion visible in wrong project

Because notes scope was not limited by project in MergeRequest#mr_and_commit_notes it causes comments from project A appears in discussions for MR in project B.

Fix bugs when discussion visible in wrong project
b658489f · Dmitriy Zaporozhets · dc825ae3 · b658489f
Commit b658489f authored Oct 07, 2013 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

merge_request.rb app/models/merge_request.rb +5 -1

No files found.
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -222,7 +222,11 @@ 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 commit_id IN (:commit_ids))", mr_id: id, commit_ids: commit_ids)
+    project.notes.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