diff options
| author | Michel Etienne | 2012-10-15 10:42:55 +0200 |
|---|---|---|
| committer | Michel Etienne | 2012-10-15 10:42:55 +0200 |
| commit | ab8549741834691c2a19dec2169b987e60ecc261 (patch) | |
| tree | da55cba182a6130c017aaf793476933026a78853 | |
| parent | 3d7f5252016f048e8025bd26138f2dfd8eae9ded (diff) | |
| parent | e0e8f0a47e20eeceb736399e7c2fcf89c70e82d9 (diff) | |
| download | chouette-core-ab8549741834691c2a19dec2169b987e60ecc261.tar.bz2 | |
Merge branch 'V2_0_0' of chouette.dryade.priv:/srv/git/chouette2 into V2_0_0
| -rw-r--r-- | config/database.yml.ccontrol | 2 |
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 |