Download as
Browse Code »

Commit 4c800342afbd3077e863132006baf19a1d30069a

Authored by Dmitriy Zaporozhets
1 parent 3c1022f9
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix routing by priority

Showing 1 changed file with 9 additions and 8 deletions   Show diff stats
config/routes.rb
  Diff comments   View file @4c80034
... ... @@ -119,6 +119,15 @@ Gitlab::Application.routes.draw do
119 119 get "files"
120 120 end
121 121  
  122 + resources :tree, only: [:show, :edit, :update], constraints: {id: /.+/}
  123 + resources :commit, only: [:show], constraints: {id: /[[:alnum:]]{6,40}/}
  124 + resources :commits, only: [:show], constraints: {id: /.+/}
  125 + resources :compare, only: [:index, :create]
  126 + resources :blame, only: [:show], constraints: {id: /.+/}
  127 + resources :blob, only: [:show], constraints: {id: /.+/}
  128 + match "/compare/:from...:to" => "compare#show", as: "compare",
  129 + :via => [:get, :post], constraints: {from: /.+/, to: /.+/}
  130 +
122 131 resources :wikis, only: [:show, :edit, :destroy, :create] do
123 132 collection do
124 133 get :pages
... ... @@ -190,14 +199,6 @@ Gitlab::Application.routes.draw do
190 199 end
191 200 end
192 201  
193   - resources :tree, only: [:show, :edit, :update], constraints: {id: /.+/}
194   - resources :commit, only: [:show], constraints: {id: /[[:alnum:]]{6,40}/}
195   - resources :commits, only: [:show], constraints: {id: /.+/}
196   - resources :compare, only: [:index, :create]
197   - resources :blame, only: [:show], constraints: {id: /.+/}
198   - resources :blob, only: [:show], constraints: {id: /.+/}
199   - match "/compare/:from...:to" => "compare#show", as: "compare",
200   - :via => [:get, :post], constraints: {from: /.+/, to: /.+/}
201 202  
202 203 resources :team, controller: 'team_members', only: [:index]
203 204 resources :milestones, except: [:destroy]
... ...