diff options
| author | Nick Thomas <nick@gitlab.com> | 2018-11-07 17:04:35 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2018-11-07 17:04:35 +0000 |
| commit | 06e8cf58558cccc5a8556e94c93aa4bf25dc083e (patch) | |
| tree | ff70c85f5445127d7a3d2813da3b3ec7904bb3e5 /spec/support | |
| parent | 98762fe651ea0c4b14106166a742feaba332c128 (diff) | |
| parent | e0054a9ab1dc7f99acff7b4614242a3dbf9328ee (diff) | |
| download | gitlab-ce-06e8cf58558cccc5a8556e94c93aa4bf25dc083e.tar.gz | |
Merge branch 'revert-45b61a9e' into 'master'
Revert "Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'"
See merge request gitlab-org/gitlab-ce!22875
Diffstat (limited to 'spec/support')
| -rw-r--r-- | spec/support/shared_examples/features/creatable_merge_request_shared_examples.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/shared_examples/features/creatable_merge_request_shared_examples.rb b/spec/support/shared_examples/features/creatable_merge_request_shared_examples.rb index 9373de5aeab..7038a366144 100644 --- a/spec/support/shared_examples/features/creatable_merge_request_shared_examples.rb +++ b/spec/support/shared_examples/features/creatable_merge_request_shared_examples.rb @@ -17,10 +17,10 @@ RSpec.shared_examples 'a creatable merge request' do sign_in(user) visit project_new_merge_request_path( target_project, - merge_request_source_branch: 'fix', merge_request: { source_project_id: source_project.id, target_project_id: target_project.id, + source_branch: 'fix', target_branch: 'master' }) end |