Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '345-update_to_rails4' of abf.rosalinux.ru:abf/rosa-build into 345-update_to_rails4 

Conflicts:
	config/routes.rb
This commit is contained in:
Alexander Machehin 2014-03-26 01:20:37 +06:00
parent fc4ad9ac0a 5a02ed077b
commit c87c150bcd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/routes.rb
View File

@ -357,7 +357,7 @@ Rosa::Application.routes.draw do
post '/sections' => 'projects#sections' post '/sections' => 'projects#sections'
delete '/remove_user' => 'projects#remove_user', as: :remove_user_project delete '/remove_user' => 'projects#remove_user', as: :remove_user_project
# constraints treeish: /[\w\-\.]+(\/[\w\-\.]+)?/ do # constraints treeish: /[\w\-\.]+(\/[\w\-\.]+)?/ do
constraints /.+/ do constraints treeish: /.+/ do
constraints Rosa::Constraints::Treeish do constraints Rosa::Constraints::Treeish do
# Tree # Tree
get '/' => "git/trees#show", as: :project get '/' => "git/trees#show", as: :project