diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2018-01-04 23:38:13 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2018-01-04 23:38:13 +0100 |
| commit | 9c9f7dc639768a0d6b930ec11c050a1333df934e (patch) | |
| tree | 7a54287bb3e8eec9a57223bdace347de72beb936 /spec/controllers/projects/merge_requests/diffs_controller_spec.rb | |
| parent | 6fb4a533b74c861a1e533604da462efb6d309de0 (diff) | |
| parent | 6f1b4dc76b4619f538b7216ad3a10ca9336d0c2b (diff) | |
| download | gitlab-ce-9c9f7dc639768a0d6b930ec11c050a1333df934e.tar.gz | |
Merge branch 'master' into 41249-clearing-the-cache
Diffstat (limited to 'spec/controllers/projects/merge_requests/diffs_controller_spec.rb')
| -rw-r--r-- | spec/controllers/projects/merge_requests/diffs_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/merge_requests/diffs_controller_spec.rb b/spec/controllers/projects/merge_requests/diffs_controller_spec.rb index ba97ccfbbd4..5d297c654bf 100644 --- a/spec/controllers/projects/merge_requests/diffs_controller_spec.rb +++ b/spec/controllers/projects/merge_requests/diffs_controller_spec.rb @@ -151,7 +151,7 @@ describe Projects::MergeRequests::DiffsController do let(:other_project) { create(:project) } before do - other_project.team << [user, :master] + other_project.add_master(user) diff_for_path(old_path: existing_path, new_path: existing_path, project_id: other_project) end |