diff options
| author | Michel Etienne | 2012-09-03 14:11:49 +0200 |
|---|---|---|
| committer | Michel Etienne | 2012-09-03 14:11:49 +0200 |
| commit | 7c1711e22cd830b8f78743fc60d0ae66b3bbbbcb (patch) | |
| tree | 0e32da4f52c39c7eac999ae34df97dad657edfdb | |
| parent | f4e5eafe8ae935314f448a48561c95e62f888e2e (diff) | |
| parent | 58438f69e471bcd6c110d6a0dd707f593cfd2162 (diff) | |
| download | chouette-core-7c1711e22cd830b8f78743fc60d0ae66b3bbbbcb.tar.bz2 | |
Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2
| -rw-r--r-- | config/database.yml.ccontrol | 2 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/config/database.yml.ccontrol b/config/database.yml.ccontrol index 659772172..c9067ea11 100644 --- a/config/database.yml.ccontrol +++ b/config/database.yml.ccontrol @@ -4,7 +4,6 @@ development: encoding: utf8 username: chouette password: chouette - template: template_chouette test: adapter: jdbcpostgresql @@ -12,7 +11,6 @@ test: encoding: utf8 username: chouette password: chouette - template: template_chouette # When war is created by jenkins production: diff --git a/config/routes.rb b/config/routes.rb index 53c5f89d3..6f51978a3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ ChouetteIhm::Application.routes.draw do devise_for :users do - match "/users/sign_up" => redirect("/subscription/new") + match "/users/sign_up" => "subscriptions#new" end resource :subscription |