summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorblackst0ne <blackst0ne.ru@gmail.com>2018-10-23 12:00:28 +1100
committerblackst0ne <blackst0ne.ru@gmail.com>2018-10-23 12:00:28 +1100
commite211ef4e9d3a1d1b44872b600d694afc38d4d820 (patch)
treea3b350275fcfb93f69b21fd6252b1a264fb187cc /config
parent4cf1845e7ea5d9a52fe5af49dd1644f98a921010 (diff)
downloadgitlab-ce-e211ef4e9d3a1d1b44872b600d694afc38d4d820.tar.gz
Make new merge request URL more friendly when pushing code
Diffstat (limited to 'config')
-rw-r--r--config/routes/project.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 9cbd5b644f6..e621f5eb8dd 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -150,8 +150,6 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
post '', action: :create, as: nil
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' }
@@ -165,6 +163,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
get :diff_for_path
get :branch_from
get :branch_to
+ get '(:merge_request_source_branch)', action: :new
end
end