diff options
| author | Luc Donnet | 2012-12-14 09:36:00 +0100 |
|---|---|---|
| committer | Luc Donnet | 2012-12-14 09:36:00 +0100 |
| commit | 47bbdf23ab08d49e0dfb0bd200a401fb57fe2e8f (patch) | |
| tree | e5a2de3807a7b2adfb0157590da873202fbe7216 /config | |
| parent | 845a400042115db5c3f7c1b77a685c5ece177d83 (diff) | |
| download | chouette-core-47bbdf23ab08d49e0dfb0bd200a401fb57fe2e8f.tar.bz2 | |
Add travis and code climate
Diffstat (limited to 'config')
| -rw-r--r-- | config/database.yml | 4 | ||||
| -rw-r--r-- | config/database.yml.travis | 5 |
2 files changed, 7 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..0335bca94 --- /dev/null +++ b/config/database.yml.travis @@ -0,0 +1,5 @@ +test: + adapter: jdbcpostgresql + 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 |