summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJose Corcuera <jzcorcuera@gmail.com>2016-01-06 09:54:43 -0500
committerJose Corcuera <jzcorcuera@gmail.com>2016-01-06 09:54:43 -0500
commit0b2fa3bfa4bea00973ad6b8c3dfb8302d84fe4de (patch)
tree315444a90e1258be8e3feb4ad89e7b5e9ac36f90 /config
parent8b39b8cd54bb73b485ee6ea7fc5d3bbfbe07cd5d (diff)
downloadgitlab-ce-0b2fa3bfa4bea00973ad6b8c3dfb8302d84fe4de.tar.gz
Fix problem with projects ending with .keys #3076
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 3e7d9f78710..d7a9df10eba 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -52,9 +52,6 @@ Rails.application.routes.draw do
API::API.logger Rails.logger
mount API::API => '/api'
- # Get all keys of user
- get ':username.keys' => 'profiles/keys#get_keys' , constraints: { username: /.*/ }
-
constraint = lambda { |request| request.env['warden'].authenticate? and request.env['warden'].user.admin? }
constraints constraint do
mount Sidekiq::Web, at: '/admin/sidekiq', as: :sidekiq
@@ -668,5 +665,8 @@ Rails.application.routes.draw do
end
end
+ # Get all keys of user
+ get ':username.keys' => 'profiles/keys#get_keys' , constraints: { username: /.*/ }
+
get ':id' => 'namespaces#show', constraints: { id: /(?:[^.]|\.(?!atom$))+/, format: /atom/ }
end