Commit 2d0c3e4c6dff291aa85e8bda18b8ac85e92c1994
1 parent
918e2213
Exists in
master
and in
4 other branches
Fix for incorrect routing to the Compare controller
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
config/routes.rb
| @@ -166,12 +166,12 @@ Gitlab::Application.routes.draw do | @@ -166,12 +166,12 @@ Gitlab::Application.routes.draw do | ||
| 166 | get "files" | 166 | get "files" |
| 167 | end | 167 | end |
| 168 | 168 | ||
| 169 | + resources :blob, only: [:show], constraints: {id: /.+/} | ||
| 169 | resources :tree, only: [:show, :edit, :update], constraints: {id: /.+/} | 170 | resources :tree, only: [:show, :edit, :update], constraints: {id: /.+/} |
| 170 | resources :commit, only: [:show], constraints: {id: /[[:alnum:]]{6,40}/} | 171 | resources :commit, only: [:show], constraints: {id: /[[:alnum:]]{6,40}/} |
| 171 | resources :commits, only: [:show], constraints: {id: /.+/} | 172 | resources :commits, only: [:show], constraints: {id: /.+/} |
| 172 | resources :compare, only: [:index, :create] | 173 | resources :compare, only: [:index, :create] |
| 173 | resources :blame, only: [:show], constraints: {id: /.+/} | 174 | resources :blame, only: [:show], constraints: {id: /.+/} |
| 174 | - resources :blob, only: [:show], constraints: {id: /.+/} | ||
| 175 | resources :graph, only: [:show], constraints: {id: /.+/} | 175 | resources :graph, only: [:show], constraints: {id: /.+/} |
| 176 | match "/compare/:from...:to" => "compare#show", as: "compare", | 176 | match "/compare/:from...:to" => "compare#show", as: "compare", |
| 177 | :via => [:get, :post], constraints: {from: /.+/, to: /.+/} | 177 | :via => [:get, :post], constraints: {from: /.+/, to: /.+/} |