diff options
author | Clement Ho <ClemMakesApps@gmail.com> | 2018-01-08 13:03:48 -0600 |
---|---|---|
committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-01-08 13:03:48 -0600 |
commit | cecea7529fb37893af6bf514a53e239a3be1eea6 (patch) | |
tree | 2781b7d777b9cf6fb76ba238b2fdce0e01a08618 /spec/features/merge_requests/created_from_fork_spec.rb | |
parent | 691cf4409145d80c09e43a10fd252d88075dc3e6 (diff) | |
parent | 1d7b46062feb1d93dd3efaf6ba4d5d934068342c (diff) | |
download | gitlab-ce-cecea7529fb37893af6bf514a53e239a3be1eea6.tar.gz |
Merge branch 'master' into fix-no-template
Diffstat (limited to 'spec/features/merge_requests/created_from_fork_spec.rb')
-rw-r--r-- | spec/features/merge_requests/created_from_fork_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_requests/created_from_fork_spec.rb b/spec/features/merge_requests/created_from_fork_spec.rb index ca2225318cd..53b62caf743 100644 --- a/spec/features/merge_requests/created_from_fork_spec.rb +++ b/spec/features/merge_requests/created_from_fork_spec.rb @@ -14,7 +14,7 @@ feature 'Merge request created from fork' do end background do - forked_project.team << [user, :master] + forked_project.add_master(user) sign_in user end |