Update other links

14 files changed, 25 insertions, 23 deletions

diff --git a/app/controllers/concerns/creates_commit.rb b/app/controllers/concerns/creates_commit.rb
index b3777fd2b0f..f644702cbdb 100644
--- a/app/controllers/concerns/creates_commit.rb
+++ b/app/controllers/concerns/creates_commit.rb
@@ -86,10 +86,10 @@ module CreatesCommit
   def new_merge_request_path
     project_new_merge_request_path(
       @project_to_commit_into,
+      merge_request_source_branch: @branch_name,
       merge_request: {
         source_project_id: @project_to_commit_into.id,
         target_project_id: @project.id,
-        source_branch: @branch_name,
         target_branch: @start_branch
       }
     )
diff --git a/app/helpers/compare_helper.rb b/app/helpers/compare_helper.rb
index 9ece8b0bc5b..57e397f6ca0 100644
--- a/app/helpers/compare_helper.rb
+++ b/app/helpers/compare_helper.rb
@@ -13,8 +13,8 @@ module CompareHelper
   def create_mr_path(from = params[:from], to = params[:to], project = @project)
     project_new_merge_request_path(
       project,
+      merge_request_source_branch: to,
       merge_request: {
-        source_branch: to,
         target_branch: from
       }
     )
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index 23d7aa427bb..8f549bfce73 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -11,10 +11,10 @@ module MergeRequestsHelper
 
   def new_mr_from_push_event(event, target_project)
     {
+      merge_request_source_branch: event.branch_name,
       merge_request: {
         source_project_id: event.project.id,
         target_project_id: target_project.id,
-        source_branch: event.branch_name,
         target_branch: target_project.repository.root_ref
       }
     }
@@ -51,10 +51,10 @@ module MergeRequestsHelper
   def mr_change_branches_path(merge_request)
     project_new_merge_request_path(
       @project,
+      merge_request_source_branch: merge_request.source_branch,
       merge_request: {
         source_project_id: merge_request.source_project_id,
         target_project_id: merge_request.target_project_id,
-        source_branch: merge_request.source_branch,
         target_branch: merge_request.target_branch
       },
       change_branches: true
diff --git a/app/views/projects/merge_requests/creations/_diffs.html.haml b/app/views/projects/merge_requests/creations/_diffs.html.haml
index 5b70e894b39..16afcc516b3 100644
--- a/app/views/projects/merge_requests/creations/_diffs.html.haml
+++ b/app/views/projects/merge_requests/creations/_diffs.html.haml
@@ -1,3 +1,4 @@
+= @merge_request.inspect
 - if @merge_request.can_be_created
   = render "projects/diffs/diffs", diffs: @diffs, environment: @environment, show_whitespace_toggle: false
 - else
diff --git a/config/routes/project.rb b/config/routes/project.rb
index e621f5eb8dd..e8a55b58656 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -149,7 +149,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
       scope path: 'merge_requests', controller: 'merge_requests/creations' do
         post '', action: :create, as: nil
 
-        scope path: 'new', as: :new_merge_request do
+        scope path: 'new/(:merge_request_source_branch)', as: :new_merge_request do
           scope constraints: { format: nil }, action: :new do
             get :diffs, defaults: { tab: 'diffs' }
             get :pipelines, defaults: { tab: 'pipelines' }
diff --git a/spec/controllers/projects/blob_controller_spec.rb b/spec/controllers/projects/blob_controller_spec.rb
index 28f7e4634a5..64b589a6d83 100644
--- a/spec/controllers/projects/blob_controller_spec.rb
+++ b/spec/controllers/projects/blob_controller_spec.rb
@@ -331,10 +331,10 @@ describe Projects::BlobController do
           expect(response).to redirect_to(
             project_new_merge_request_path(
               forked_project,
+              merge_request_source_branch: "fork-test-1",
               merge_request: {
                 source_project_id: forked_project.id,
                 target_project_id: project.id,
-                source_branch: "fork-test-1",
                 target_branch: "master"
               }
             )
diff --git a/spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb b/spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb
index 0ccab5b2fac..a124c99ecc8 100644
--- a/spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb
+++ b/spec/features/merge_request/user_allows_commits_from_memebers_who_can_merge_spec.rb
@@ -9,10 +9,10 @@ describe 'create a merge request, allowing commits from members who can merge to
   def visit_new_merge_request
     visit project_new_merge_request_path(
       source_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
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 f15129759de..6541555adde 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
diff --git a/spec/features/merge_request/user_sees_wip_help_message_spec.rb b/spec/features/merge_request/user_sees_wip_help_message_spec.rb
index 92cc73ddf1f..6dfc819fe8a 100644
--- a/spec/features/merge_request/user_sees_wip_help_message_spec.rb
+++ b/spec/features/merge_request/user_sees_wip_help_message_spec.rb
@@ -13,10 +13,10 @@ describe 'Merge request > User sees WIP help message' do
     it 'shows a specific WIP hint' do
       visit project_new_merge_request_path(
         project,
+        merge_request_source_branch: 'wip',
         merge_request: {
           source_project_id: project.id,
           target_project_id: project.id,
-          source_branch: 'wip',
           target_branch: 'master'
         })
 
@@ -32,10 +32,10 @@ describe 'Merge request > User sees WIP help message' do
     it 'shows the regular WIP message' do
       visit project_new_merge_request_path(
         project,
+        merge_request_source_branch: 'fix',
         merge_request: {
           source_project_id: project.id,
           target_project_id: project.id,
-          source_branch: 'fix',
           target_branch: 'master'
         })
 
diff --git a/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb b/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb
index ae41cf90576..147544740dc 100644
--- a/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb
+++ b/spec/features/merge_request/user_selects_branches_for_new_mr_spec.rb
@@ -109,13 +109,13 @@ describe 'Merge request > User selects branches for new MR', :js do
   end
 
   it 'populates source branch button' do
-    visit project_new_merge_request_path(project, change_branches: true, merge_request: { target_branch: 'master', source_branch: 'fix' })
+    visit project_new_merge_request_path(project, change_branches: true, merge_request_source_branch: 'fix', merge_request: { target_branch: 'master' })
 
     expect(find('.js-source-branch')).to have_content('fix')
   end
 
   it 'allows to change the diff view' do
-    visit project_new_merge_request_path(project, merge_request: { target_branch: 'master', source_branch: 'fix' })
+    visit project_new_merge_request_path(project, merge_request_source_branch: 'fix', merge_request: { target_branch: 'master' })
 
     click_link 'Changes'
 
@@ -131,7 +131,7 @@ describe 'Merge request > User selects branches for new MR', :js do
   end
 
   it 'does not allow non-existing branches' do
-    visit project_new_merge_request_path(project, merge_request: { target_branch: 'non-exist-target', source_branch: 'non-exist-source' })
+    visit project_new_merge_request_path(project, merge_request_source_branch: 'non-exist-source', merge_request: { target_branch: 'non-exist-target' })
 
     expect(page).to have_content('The form contains the following errors')
     expect(page).to have_content('Source branch "non-exist-source" does not exist')
@@ -140,7 +140,7 @@ describe 'Merge request > User selects branches for new MR', :js do
 
   context 'when a branch contains commits that both delete and add the same image' do
     it 'renders the diff successfully' do
-      visit project_new_merge_request_path(project, merge_request: { target_branch: 'master', source_branch: 'deleted-image-test' })
+      visit project_new_merge_request_path(project, merge_request_source_branch: 'deleted-image-test', merge_request: { target_branch: 'master' })
 
       click_link "Changes"
 
@@ -165,7 +165,8 @@ describe 'Merge request > User selects branches for new MR', :js do
     it 'shows pipelines for a new merge request' do
       visit project_new_merge_request_path(
         project,
-        merge_request: { target_branch: 'master', source_branch: 'fix' })
+        merge_request_source_branch: 'fix',
+        merge_request: { target_branch: 'master' })
 
       page.within('.merge-request') do
         click_link 'Pipelines'
diff --git a/spec/features/merge_request/user_uses_quick_actions_spec.rb b/spec/features/merge_request/user_uses_quick_actions_spec.rb
index b81478a481f..6e681185e1f 100644
--- a/spec/features/merge_request/user_uses_quick_actions_spec.rb
+++ b/spec/features/merge_request/user_uses_quick_actions_spec.rb
@@ -144,7 +144,7 @@ describe 'Merge request > User uses quick actions', :js do
 
     describe '/target_branch command in merge request' do
       let(:another_project) { create(:project, :public, :repository) }
-      let(:new_url_opts) { { merge_request: { source_branch: 'feature' } } }
+      let(:new_url_opts) { { merge_request_source_branch: 'feature' } }
 
       before do
         another_project.add_maintainer(user)
diff --git a/spec/features/merge_requests/user_squashes_merge_request_spec.rb b/spec/features/merge_requests/user_squashes_merge_request_spec.rb
index ec1153b7f7f..8ecdec491b8 100644
--- a/spec/features/merge_requests/user_squashes_merge_request_spec.rb
+++ b/spec/features/merge_requests/user_squashes_merge_request_spec.rb
@@ -65,7 +65,7 @@ describe 'User squashes a merge request', :js do
 
   context 'when squash is enabled on merge request creation' do
     before do
-      visit project_new_merge_request_path(project, merge_request: { target_branch: 'master', source_branch: source_branch })
+      visit project_new_merge_request_path(project, merge_request_source_branch: source_branch, merge_request: { target_branch: 'master' })
       check 'merge_request[squash]'
       click_on 'Submit merge request'
       wait_for_requests
@@ -95,7 +95,7 @@ describe 'User squashes a merge request', :js do
 
   context 'when squash is not enabled on merge request creation' do
     before do
-      visit project_new_merge_request_path(project, merge_request: { target_branch: 'master', source_branch: source_branch })
+      visit project_new_merge_request_path(project, merge_request_source_branch: source_branch, merge_request: { target_branch: 'master' })
       click_on 'Submit merge request'
       wait_for_requests
     end
diff --git a/spec/features/projects/merge_request_button_spec.rb b/spec/features/projects/merge_request_button_spec.rb
index 69561b4d733..4be31511ceb 100644
--- a/spec/features/projects/merge_request_button_spec.rb
+++ b/spec/features/projects/merge_request_button_spec.rb
@@ -22,8 +22,8 @@ describe 'Merge Request button' do
 
       it 'shows Create merge request button' do
         href = project_new_merge_request_path(project,
-                                              merge_request: { source_branch: 'feature',
-                                                               target_branch: 'master' })
+                                              merge_request_source_branch: 'feature',
+                                              merge_request: { target_branch: 'master' })
 
         visit url
 
@@ -77,8 +77,8 @@ describe 'Merge Request button' do
 
         it 'shows Create merge request button' do
           href = project_new_merge_request_path(forked_project,
-                                                merge_request: { source_branch: 'feature',
-                                                                 target_branch: 'master' })
+                                                merge_request_source_branch: 'feature',
+                                                merge_request: { target_branch: 'master' })
 
           visit fork_url
 
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 7038a366144..9373de5aeab 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