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 /config | |
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 'config')
-rw-r--r-- | config/routes/project.rb | 5 |
1 files changed, 3 insertions, 2 deletions
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 |