aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/database.yml.ccontrol2
-rw-r--r--config/routes.rb2
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