aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Florisson2012-10-03 17:42:05 +0200
committerMarc Florisson2012-10-03 17:42:05 +0200
commitf269ec857e4aa35e2e64e3121a23f349a34e261e (patch)
treeec1e65bc967577946d00755cb44e1e895c83f979
parent04835501dbf267b2046d24e65400e23c927d4ab3 (diff)
downloadchouette-core-f269ec857e4aa35e2e64e3121a23f349a34e261e.tar.bz2
config database.yml.ccontrol for many branches
-rw-r--r--config/database.yml.ccontrol2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/database.yml.ccontrol b/config/database.yml.ccontrol
index c9067ea11..48e2764af 100644
--- a/config/database.yml.ccontrol
+++ b/config/database.yml.ccontrol
@@ -7,7 +7,7 @@ development:
test:
adapter: jdbcpostgresql
- database: chouette2_test
+ database: <%= ENV["GIT_BRANCH"] == "master" ? "chouette_test" : "chouette_" + ENV["GIT_BRANCH"] + "_test" %>
encoding: utf8
username: chouette
password: chouette