summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-12-28 13:43:08 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-12-28 13:43:08 +0200
commit7f1d954873263b5406bdd25afa02b06013cb70e3 (patch)
tree3c24a39def52f5aa96a36e7b865fbd0fd1b4343a /config
parentb93c72e33a50aaed845fe333dee0201b0b11934e (diff)
downloadgitlab-ce-7f1d954873263b5406bdd25afa02b06013cb70e3.tar.gz
Fix 500 error when visit group from admin area if group name contains dotdz-improve-admin-group-routing
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'config')
-rw-r--r--config/routes/admin.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes/admin.rb b/config/routes/admin.rb
index 0dd2c8f7aef..23295b43c92 100644
--- a/config/routes/admin.rb
+++ b/config/routes/admin.rb
@@ -32,7 +32,7 @@ namespace :admin do
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
scope(as: :group) do
put :members_update