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

Conflicts: config/routes.rb
2014-03-26 01:20:37 +06:00 · 2014-03-26 01:20:37 +06:00 · c87c150bcd
parent fc4ad9ac0a 5a02ed077b
commit c87c150bcd
1 changed files with 1 additions and 1 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -357,7 +357,7 @@ Rosa::Application.routes.draw do
      post '/sections' => 'projects#sections'
      delete '/remove_user' => 'projects#remove_user', as: :remove_user_project
      # constraints treeish: /[\w\-\.]+(\/[\w\-\.]+)?/ do
-      constraints /.+/ do
+      constraints treeish: /.+/ do
        constraints Rosa::Constraints::Treeish do
          # Tree
          get '/' => "git/trees#show", as: :project