summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorSebastian Ziebell <sebastian.ziebell@asquera.de>2013-02-13 10:31:06 +0100
committerSebastian Ziebell <sebastian.ziebell@asquera.de>2013-02-13 10:31:06 +0100
commit375caeefcfb2672c8fdce18cf6f35372729d0c43 (patch)
tree74b90868c88f9641a0975271f8a5620709f90eb9 /config
parentae40e855efc393d752f290ed8eda67961874acf5 (diff)
parentb9f8b4019073fe60515bda8947d9040b4b73ea38 (diff)
downloadgitlab-ce-375caeefcfb2672c8fdce18cf6f35372729d0c43.tar.gz
Merge branch 'master' into fixes/api
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb
index 366ed85cbc6..125ec6bc588 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -167,12 +167,12 @@ Gitlab::Application.routes.draw do
get "files"
end
+ resources :blob, only: [:show], constraints: {id: /.+/}
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: /.+/}
resources :graph, only: [:show], constraints: {id: /.+/}
match "/compare/:from...:to" => "compare#show", as: "compare",
:via => [:get, :post], constraints: {from: /.+/, to: /.+/}