Merge branch 'web_editor'

This commit is contained in:
randx 2012-10-15 19:52:10 +03:00
commit bd5dbe14e4
95 changed files with 162513 additions and 7 deletions

View file

@ -183,7 +183,7 @@ Gitlab::Application.routes.draw do
resources :compare, only: [:index, :create]
resources :blame, only: [:show], constraints: {id: /.+/}
resources :blob, only: [:show], constraints: {id: /.+/}
resources :tree, only: [:show], constraints: {id: /.+/}
resources :tree, only: [:show, :edit, :update], constraints: {id: /.+/}
match "/compare/:from...:to" => "compare#show", as: "compare",
:via => [:get, :post], constraints: {from: /.+/, to: /.+/}