summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-20 13:01:43 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-20 13:01:43 -0700
commit651397513ae302ffd36e10cf5f9ba43c1d673bdc (patch)
tree08ad0c34c721b71f5c17c8d87e6a0dfcc5ed7210 /config
parent2852d0b6207fd1b14227a659a90d80fffa544e4c (diff)
downloadgitlab-ce-651397513ae302ffd36e10cf5f9ba43c1d673bdc.tar.gz
Fix commits routing
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/config/routes.rb b/config/routes.rb
index b1aeb686752..03b4a32a9dd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -332,7 +332,7 @@ Gitlab::Application.routes.draw do
get(
'/commits/*id',
to: 'commits#show',
- constraints: { id: /.+/, format: /(html|js)/ },
+ constraints: { id: /(?:[^.]|\.(?!atom$))+/, format: /atom/ },
as: :commits
)
end
@@ -342,7 +342,6 @@ Gitlab::Application.routes.draw do
get :branches, on: :member
end
- resources :commits, only: [:show], constraints: { id: /(?:[^.]|\.(?!atom$))+/, format: /atom/ }
resources :compare, only: [:index, :create]
resources :network, only: [:show], constraints: { id: /(?:[^.]|\.(?!json$))+/, format: /json/ }