aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Florisson2012-10-03 18:06:09 +0200
committerMarc Florisson2012-10-03 18:06:09 +0200
commite0e8f0a47e20eeceb736399e7c2fcf89c70e82d9 (patch)
tree9f1b271b9dafcf2e9a00dc9acf739673c2d79e73
parent10bdbef3a83d1e7d72fcc7cf6fb3b0e8e8529f73 (diff)
downloadchouette-core-e0e8f0a47e20eeceb736399e7c2fcf89c70e82d9.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