diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-10-22 18:38:00 +0200 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-10-22 18:38:00 +0200 |
| commit | 95df86638d364a87469550cce852871634ace262 (patch) | |
| tree | 976d404874ff0b47e6bd779164d115fa79461a58 /app/models/merge_request.rb | |
| parent | b97977afef26e8aaad9228c8c7dffecdbe1a8e59 (diff) | |
| download | gitlab-ce-comments_fix.tar.gz | |
Fix: Inability to reply to code comments in the MR view, if the MR comes from a forkcomments_fix
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 21861a46a84..8d9ad44681d 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -257,7 +257,7 @@ class MergeRequest < ActiveRecord::Base Note.where( "(project_id = :target_project_id AND noteable_type = 'MergeRequest' AND noteable_id = :mr_id) OR" + - "(project_id = :source_project_id AND noteable_type = 'Commit' AND commit_id IN (:commit_ids))", + "((project_id = :source_project_id OR project_id = :target_project_id) AND noteable_type = 'Commit' AND commit_id IN (:commit_ids))", mr_id: id, commit_ids: commit_ids, target_project_id: target_project_id, |