diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-22 15:05:52 +0200 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-06-22 15:05:52 +0200 |
| commit | 97c42df3b804a37e659c3cda6bd8a52570f31366 (patch) | |
| tree | 97c38db7f71a93a7b0db5ca2c682d6d17479cbdb /spec/features/merge_requests/only_allow_merge_if_build_succeeds_spec.rb | |
| parent | 3833f1dd84dfec844443a5b1d9ba2bd2b911c0bc (diff) | |
| parent | 11716f310dcc495600f5a17e08456a1abb296482 (diff) | |
| download | gitlab-ce-97c42df3b804a37e659c3cda6bd8a52570f31366.tar.gz | |
Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-review-branch28717-additional-metrics-review-branch
Diffstat (limited to 'spec/features/merge_requests/only_allow_merge_if_build_succeeds_spec.rb')
| -rw-r--r-- | spec/features/merge_requests/only_allow_merge_if_build_succeeds_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_requests/only_allow_merge_if_build_succeeds_spec.rb b/spec/features/merge_requests/only_allow_merge_if_build_succeeds_spec.rb index b1dc81a606a..5cd9a7fbe26 100644 --- a/spec/features/merge_requests/only_allow_merge_if_build_succeeds_spec.rb +++ b/spec/features/merge_requests/only_allow_merge_if_build_succeeds_spec.rb @@ -5,7 +5,7 @@ feature 'Only allow merge requests to be merged if the pipeline succeeds', featu let(:project) { merge_request.target_project } before do - login_as merge_request.author + gitlab_sign_in merge_request.author project.team << [merge_request.author, :master] end |