Merge pull request #106 from zoombody/cleanup

update gitignore rules to match rails 3.2.8 defaults
This commit is contained in:
Matt Rogers 2012-09-27 08:53:20 -07:00
commit 7faf3adfb5
2 changed files with 5 additions and 5 deletions

10
.gitignore vendored
View file

@ -6,18 +6,18 @@
config/database.yml config/database.yml
config/site.yml config/site.yml
config/deploy.rb config/deploy.rb
db/*.sqlite3 /db/*.sqlite3
db/*.db /db/*.db
db/data.yml db/data.yml
db/schema.rb db/schema.rb
log /log/*.log
nbproject nbproject
tmp /tmp
vendor/plugins/query_trace/ vendor/plugins/query_trace/
rerun.txt rerun.txt
.idea .idea
.rvmrc .rvmrc
.yardoc .yardoc
tags tags
/.bundle/ /.bundle
/public/assets/ /public/assets/

0
log/.gitkeep Normal file
View file