Skip to content

Commit 97b91bc

Browse files
committed
Ignores database.yml files
* creates sample database.yml files instead to show configuration, but avoid from seeing uncommited changes on database.yml files
1 parent 5281c20 commit 97b91bc

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ Gemfile.lock
44
pkg/*
55
*.log
66
*.sw[pno]
7+
spec/config/database.yml
8+
spec/dummy/config/database.yml

README.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,9 @@ All jobs *must* stored in the global (public) namespace, so add it to the list o
205205

206206
## Development
207207

208-
* The Local setup for development assumes that a root user with no password exists for both mysql and postgresl
208+
* In both `spec/dummy/config` and `spec/config`, you will see `database.yml.sample` files
209+
* Copy them into the same directory but with the name `database.yml`
210+
* Edit them to fit your own settings
209211
* Rake tasks (see the Rakefile) will help you setup your dbs necessary to run tests
210212
* Please issue pull requests to the `development` branch. All development happens here, master is used for releases
211-
* Ensure that your code is accompanied with tests. No code will be merged without tests
213+
* Ensure that your code is accompanied with tests. No code will be merged without tests
File renamed without changes.

spec/dummy/config/database.yml spec/dummy/config/database.yml.sample

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ test:
77
min_messages: WARNING
88
pool: 5
99
timeout: 5000
10-
10+
1111
development:
1212
adapter: postgresql
1313
database: apartment_postgresql_development

0 commit comments

Comments
 (0)