summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2012-09-20 15:32:00 -0400
committerRobert Speicher <rspeicher@gmail.com>2012-09-26 16:32:22 -0400
commit3574826920eb958c5e59e86bb79b0773c187abfb (patch)
tree629e77aefb21eb32e7e3b2a789ae09eef1cc9575 /config
parent169f16fb32091701bcaa962872ea35b5772a1539 (diff)
downloadgitlab-ce-3574826920eb958c5e59e86bb79b0773c187abfb.tar.gz
Use Commits#show instead of Commits#index
Takes tree-ish + path as ID
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb26
1 files changed, 13 insertions, 13 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 708dd7d58f1..01889bb2bd8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -159,13 +159,20 @@ Gitlab::Application.routes.draw do
end
end
- resources :commit, only: [:show], constraints: {id: /[[:alnum:]]{6,40}/}
+ # XXX: WIP
+ resources :commit, only: [:show], constraints: {id: /[[:alnum:]]{6,40}/}
+ resources :commits, only: [:show], constraints: {id: /.+/}, as: 'history'
+ resources :blame, only: [:show], constraints: {id: /.+/}
+ resources :blob, only: [:show], constraints: {id: /.+/}
+ # resources :raw, only: [:show], constraints: {id: /.+/}
+ resources :tree, only: [:show], constraints: {id: /.+/}
+ match "/compare/:from...:to" => "compare#show", as: "compare", constraints: {from: /.+/, to: /.+/}
- resources :commits, only: [:index, :show] do
- member do
- get :patch
- end
- end
+ # resources :commits, only: [:show], as: 'history' do
+ # member do
+ # get :patch
+ # end
+ # end
resources :team, controller: 'team_members', only: [:index]
resources :team_members
@@ -184,13 +191,6 @@ Gitlab::Application.routes.draw do
post :preview
end
end
-
- # XXX: WIP
- resources :blame, only: [:show], constraints: {id: /.+/}
- resources :blob, only: [:show], constraints: {id: /.+/}
- # resources :raw, only: [:show], constraints: {id: /.+/}
- resources :tree, only: [:show], constraints: {id: /.+/}
- match "/compare/:from...:to" => "compare#show", as: "compare", constraints: {from: /.+/, to: /.+/}
end
root to: "dashboard#index"