diff options
| author | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-01-09 00:50:54 +0100 |
|---|---|---|
| committer | Constance Okoghenun <cokoghenun@gitlab.com> | 2018-01-09 00:50:54 +0100 |
| commit | 85e8acedaf1d4e51335c59a0efa2f95576a4fde3 (patch) | |
| tree | 9b21d76626568158cf746e2a7eb4853efe3aa0d5 /spec/models/note_spec.rb | |
| parent | cdcade0dd4e748bcf0119b307c06993e0669f507 (diff) | |
| parent | bd50ecbad8c00e7c9ab5c60fa8bc839a8905b4ab (diff) | |
| download | gitlab-ce-move-project-dropdown.tar.gz | |
Resolved conflictsmove-project-dropdown
Diffstat (limited to 'spec/models/note_spec.rb')
| -rw-r--r-- | spec/models/note_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb index cefbf60b28c..3d030927036 100644 --- a/spec/models/note_spec.rb +++ b/spec/models/note_spec.rb @@ -195,7 +195,7 @@ describe Note do describe "cross_reference_not_visible_for?" do let(:private_user) { create(:user) } - let(:private_project) { create(:project, namespace: private_user.namespace) { |p| p.team << [private_user, :master] } } + let(:private_project) { create(:project, namespace: private_user.namespace) { |p| p.add_master(private_user) } } let(:private_issue) { create(:issue, project: private_project) } let(:ext_proj) { create(:project, :public) } |