From 4c800342afbd3077e863132006baf19a1d30069a Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 25 Dec 2012 16:24:44 +0200 Subject: [PATCH] Fix routing by priority --- config/routes.rb | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index 51b1836..4317962 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -119,6 +119,15 @@ Gitlab::Application.routes.draw do get "files" end + resources :tree, only: [:show, :edit, :update], constraints: {id: /.+/} + resources :commit, only: [:show], constraints: {id: /[[:alnum:]]{6,40}/} + resources :commits, only: [:show], constraints: {id: /.+/} + resources :compare, only: [:index, :create] + resources :blame, only: [:show], constraints: {id: /.+/} + resources :blob, only: [:show], constraints: {id: /.+/} + match "/compare/:from...:to" => "compare#show", as: "compare", + :via => [:get, :post], constraints: {from: /.+/, to: /.+/} + resources :wikis, only: [:show, :edit, :destroy, :create] do collection do get :pages @@ -190,14 +199,6 @@ Gitlab::Application.routes.draw do end end - resources :tree, only: [:show, :edit, :update], constraints: {id: /.+/} - resources :commit, only: [:show], constraints: {id: /[[:alnum:]]{6,40}/} - resources :commits, only: [:show], constraints: {id: /.+/} - resources :compare, only: [:index, :create] - resources :blame, only: [:show], constraints: {id: /.+/} - resources :blob, only: [:show], constraints: {id: /.+/} - match "/compare/:from...:to" => "compare#show", as: "compare", - :via => [:get, :post], constraints: {from: /.+/, to: /.+/} resources :team, controller: 'team_members', only: [:index] resources :milestones, except: [:destroy] -- libgit2 0.21.2