From e0054a9ab1dc7f99acff7b4614242a3dbf9328ee Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Wed, 7 Nov 2018 13:32:20 +0000 Subject: Revert "Merge branch 'blackst0ne-update-push-new-merge-request-url' into 'master'" This reverts merge request !22526 --- config/routes/project.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'config') diff --git a/config/routes/project.rb b/config/routes/project.rb index 387d2363552..3f1ad90dfca 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -149,7 +149,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do scope path: 'merge_requests', controller: 'merge_requests/creations' do post '', action: :create, as: nil - scope path: 'new/(:merge_request_source_branch)', as: :new_merge_request do + scope path: 'new', as: :new_merge_request do + get '', action: :new + scope constraints: { format: nil }, action: :new do get :diffs, defaults: { tab: 'diffs' } get :pipelines, defaults: { tab: 'pipelines' } @@ -163,7 +165,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do get :diff_for_path get :branch_from get :branch_to - get '', action: :new end end -- cgit v1.2.3