diff options
| author | Marc Florisson | 2012-12-14 11:47:57 +0100 |
|---|---|---|
| committer | Marc Florisson | 2012-12-14 11:47:57 +0100 |
| commit | 7460766bdd9f6d06ea08eab3c4e30877a0eca73b (patch) | |
| tree | ee7ede3c4c05749adb3c764295d182bb33644c1f /config | |
| parent | a2f22fcaa3415b90d01ee04574818ec9595275a0 (diff) | |
| parent | 43d4f4be8daf08747ff53f4e0e69c39b95255de9 (diff) | |
| download | chouette-core-7460766bdd9f6d06ea08eab3c4e30877a0eca73b.tar.bz2 | |
Merge branch 'master' into api_key
Diffstat (limited to 'config')
| -rw-r--r-- | config/database.yml | 4 | ||||
| -rw-r--r-- | config/database.yml.travis | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/config/database.yml b/config/database.yml index 0c5c4ba6e..ecff83b1f 100644 --- a/config/database.yml +++ b/config/database.yml @@ -8,8 +8,8 @@ development: adapter: <%= RUBY_PLATFORM == "java" ? "jdbcpostgresql" : "postgresql" %> database: chouette_dev encoding: utf8 - username: chouette - password: chouette + username: luc + password: monalisa # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". diff --git a/config/database.yml.travis b/config/database.yml.travis new file mode 100644 index 000000000..797872065 --- /dev/null +++ b/config/database.yml.travis @@ -0,0 +1,11 @@ +development: + adapter: <%= RUBY_PLATFORM == "java" ? "jdbcpostgresql" : "postgresql" %> + database: <%= (ENV["GIT_BRANCH"].nil? || ENV["GIT_BRANCH"] == "master") ? "chouette_dev" : "chouette_" + ENV["GIT_BRANCH"] + "_dev" %> + encoding: utf8 + username: postgres + +test: + adapter: <%= RUBY_PLATFORM == "java" ? "jdbcpostgresql" : "postgresql" %> + database: <%= (ENV["GIT_BRANCH"].nil? || ENV["GIT_BRANCH"] == "master") ? "chouette_test" : "chouette_" + ENV["GIT_BRANCH"] + "_test" %> + encoding: utf8 + username: postgres
\ No newline at end of file |