summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-01-25 13:43:46 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-01-25 13:43:46 +0000
commit4480bef182307c0b389e84685c8bf680105b18ee (patch)
tree50db5ccf1fefad14882f24dec5a205d7b012ba63 /config
parent8a9597fc737b9c848b8e1935551edb2f1d09aab0 (diff)
parent0d9e80c3ddedb5b56165dffa6cb248ee49091abf (diff)
downloadgitlab-ce-4480bef182307c0b389e84685c8bf680105b18ee.tar.gz
Merge branch 'dz-fix-group-canonical-route' into 'master'
Fix 500 error for Group#web_url method if nested group See merge request !8743
Diffstat (limited to 'config')
-rw-r--r--config/routes/group.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/config/routes/group.rb b/config/routes/group.rb
index 776c31c9dac..60a1175fe80 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -19,13 +19,11 @@ end
scope(path: 'groups/*id',
controller: :groups,
- constraints: { id: Gitlab::Regex.namespace_route_regex }) do
+ constraints: { id: Gitlab::Regex.namespace_route_regex, format: /(html|json|atom)/ }) do
get :edit, as: :edit_group
get :issues, as: :issues_group
get :merge_requests, as: :merge_requests_group
get :projects, as: :projects_group
get :activity, as: :activity_group
+ get '/', action: :show, as: :group_canonical
end
-
-# Must be last route in this file
-get 'groups/*id' => 'groups#show', as: :group_canonical, constraints: { id: Gitlab::Regex.namespace_route_regex }