diff options
| author | Michel Etienne | 2012-10-16 13:51:39 +0200 |
|---|---|---|
| committer | Michel Etienne | 2012-10-16 13:51:39 +0200 |
| commit | cfd3412d431313a44fdc3f3b483aa78f98bcfb1f (patch) | |
| tree | 38fe24ff5073b53a3b20f66c8f631e9748c124e5 | |
| parent | ed52454d35af1456f0e1a30551b13df526ed3185 (diff) | |
| download | chouette-core-cfd3412d431313a44fdc3f3b483aa78f98bcfb1f.tar.bz2 | |
correct branch test for war conflict
| -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 48e2764af..c1cccd735 100644 --- a/config/database.yml.ccontrol +++ b/config/database.yml.ccontrol @@ -7,7 +7,7 @@ development: test: adapter: jdbcpostgresql - database: <%= ENV["GIT_BRANCH"] == "master" ? "chouette_test" : "chouette_" + ENV["GIT_BRANCH"] + "_test" %> + database: <%= ENV["GIT_BRANCH"].nil? || ENV["GIT_BRANCH"] == "master" ? "chouette_test" : "chouette_" + ENV["GIT_BRANCH"] + "_test" %> encoding: utf8 username: chouette password: chouette |