Permalink
Browse files

Merge pull request #40 from ramontayag/development

Ignores vim swp files
  • Loading branch information...
2 parents c08f2ec + 97b91bc commit a6dd6c0894c25de3718bbe1e4e92b911fa10060d @bradrobertson bradrobertson committed Jun 17, 2012
View
@@ -3,4 +3,6 @@
Gemfile.lock
pkg/*
*.log
-
+*.sw[pno]
+spec/config/database.yml
+spec/dummy/config/database.yml
View
@@ -207,7 +207,9 @@ All jobs *must* stored in the global (public) namespace, so add it to the list o
## Development
-* The Local setup for development assumes that a root user with no password exists for both mysql and postgresl
+* In both `spec/dummy/config` and `spec/config`, you will see `database.yml.sample` files
+ * Copy them into the same directory but with the name `database.yml`
+ * Edit them to fit your own settings
* Rake tasks (see the Rakefile) will help you setup your dbs necessary to run tests
* Please issue pull requests to the `development` branch. All development happens here, master is used for releases
-* Ensure that your code is accompanied with tests. No code will be merged without tests
+* Ensure that your code is accompanied with tests. No code will be merged without tests
File renamed without changes.
@@ -7,7 +7,7 @@ test:
min_messages: WARNING
pool: 5
timeout: 5000
-
+
development:
adapter: postgresql
database: apartment_postgresql_development

0 comments on commit a6dd6c0

Please sign in to comment.