diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-10-29 21:19:42 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-10-29 21:19:42 +0000 |
| commit | 45b61a9ece48550f51432c8cca7de7e1a298ca08 (patch) | |
| tree | b305158d82f83dc16203490ed03e7103d7e523d3 /spec/features/merge_request/user_sees_merge_widget_spec.rb | |
| parent | e4e40b963226099ba76718b692c6c944336c7f5c (diff) | |
| parent | 72ff187c36bc73bddb349269f08f8fb46eab2676 (diff) | |
| download | gitlab-ce-45b61a9ece48550f51432c8cca7de7e1a298ca08.tar.gz | |
Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'
Make new merge request URL more friendly when pushing code
Closes #53012
See merge request gitlab-org/gitlab-ce!22526
Diffstat (limited to 'spec/features/merge_request/user_sees_merge_widget_spec.rb')
| -rw-r--r-- | spec/features/merge_request/user_sees_merge_widget_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/merge_request/user_sees_merge_widget_spec.rb b/spec/features/merge_request/user_sees_merge_widget_spec.rb index 4e5699f9571..d2003b61b2a 100644 --- a/spec/features/merge_request/user_sees_merge_widget_spec.rb +++ b/spec/features/merge_request/user_sees_merge_widget_spec.rb @@ -20,10 +20,10 @@ describe 'Merge request > User sees merge widget', :js do before do visit project_new_merge_request_path( project, + merge_request_source_branch: 'feature', merge_request: { source_project_id: project.id, target_project_id: project.id, - source_branch: 'feature', target_branch: 'master' }) end |