summaryrefslogtreecommitdiff
path: root/spec/features/merge_requests/edit_mr_spec.rb
diff options
context:
space:
mode:
authorMatija Čupić <matteeyah@gmail.com>2018-01-04 23:38:13 +0100
committerMatija Čupić <matteeyah@gmail.com>2018-01-04 23:38:13 +0100
commit9c9f7dc639768a0d6b930ec11c050a1333df934e (patch)
tree7a54287bb3e8eec9a57223bdace347de72beb936 /spec/features/merge_requests/edit_mr_spec.rb
parent6fb4a533b74c861a1e533604da462efb6d309de0 (diff)
parent6f1b4dc76b4619f538b7216ad3a10ca9336d0c2b (diff)
downloadgitlab-ce-9c9f7dc639768a0d6b930ec11c050a1333df934e.tar.gz
Merge branch 'master' into 41249-clearing-the-cache
Diffstat (limited to 'spec/features/merge_requests/edit_mr_spec.rb')
-rw-r--r--spec/features/merge_requests/edit_mr_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_requests/edit_mr_spec.rb b/spec/features/merge_requests/edit_mr_spec.rb
index 4362f8b3fcc..79be2fbf945 100644
--- a/spec/features/merge_requests/edit_mr_spec.rb
+++ b/spec/features/merge_requests/edit_mr_spec.rb
@@ -6,7 +6,7 @@ feature 'Edit Merge Request' do
let(:merge_request) { create(:merge_request, :simple, source_project: project) }
before do
- project.team << [user, :master]
+ project.add_master(user)
sign_in user