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 /spec/models/merge_request_spec.rb | |
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 'spec/models/merge_request_spec.rb')
-rw-r--r-- | spec/models/merge_request_spec.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb index 6aaf1c036b0..eed2cbc5412 100644 --- a/spec/models/merge_request_spec.rb +++ b/spec/models/merge_request_spec.rb @@ -79,6 +79,12 @@ describe MergeRequest do expect(merge_request.commits).not_to be_empty expect(merge_request.mr_and_commit_notes.count).to eq(2) end + + it "should include notes for commits from target project as well" do + create(:note, commit_id: merge_request.commits.first.id, noteable_type: 'Commit', project: merge_request.target_project) + expect(merge_request.commits).not_to be_empty + expect(merge_request.mr_and_commit_notes.count).to eq(3) + end end describe '#is_being_reassigned?' do |