Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
renamed database.yml and moved it out of git to avoid conflicts
- Loading branch information
Showing
3 changed files
with
34 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,5 @@ | ||
.bundle | ||
config/database.yml | ||
db/*.sqlite3 | ||
log/*.log | ||
tmp/ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
# SQLite version 3.x | ||
# gem install sqlite3-ruby (not necessary on OS X Leopard) | ||
development: | ||
adapter: mysql2 | ||
encoding: utf8 | ||
database: seti_dev | ||
pool: 5 | ||
username: | ||
password: | ||
socket: /var/run/mysqld/mysqld.sock | ||
|
||
|
||
# Warning: The database defined as "test" will be erased and | ||
# re-generated from your development database when you run "rake". | ||
# Do not set this db to the same as development or production. | ||
test: | ||
adapter: mysql2 | ||
encoding: utf8 | ||
database: seti_test | ||
pool: 5 | ||
username: | ||
password: | ||
socket: /var/run/mysqld/mysqld.sock | ||
|
||
production: | ||
adapter: mysql2 | ||
encoding: utf8 | ||
database: seti_prod | ||
pool: 5 | ||
username: | ||
password: | ||
socket: /var/run/mysqld/mysqld.sock | ||
|
This file was deleted.
Oops, something went wrong.