diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-23 09:46:18 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-23 09:46:18 +0000 |
| commit | 3bb39f0e49c1dd744d4badc5982eb9ace7de5292 (patch) | |
| tree | 5444c0bfad14754ac7ab5cbaaa6c5ab663f80d38 /app/models | |
| parent | 0e73d7b6af77e2191da2c8fea7232bc8d4a4bbe4 (diff) | |
| parent | 95df86638d364a87469550cce852871634ace262 (diff) | |
| download | gitlab-ce-3bb39f0e49c1dd744d4badc5982eb9ace7de5292.tar.gz | |
Merge branch 'comments_fix' into 'master'
Fix: Inability to reply to code comments in the MR view, if the MR comes from a fork
https://dev.gitlab.org/gitlab/gitlabhq/issues/2535
See merge request !1675
Diffstat (limited to 'app/models')
| -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, |