X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=.gitignore;h=37dfd83038b093cdcdf820876fb5136fcfe60847;hb=HEAD;hp=cc19b664fe12aa3aa05f53a513e8540bfa571fa5;hpb=b24d0db11b8a9b6815c0b235b77e557ea5993e35;p=feedcatcher.git

diff --git a/.gitignore b/.gitignore
index cc19b66..37dfd83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,46 @@
-*~
-*log
-database.yml
-deploy.rb
-*doc
-tmp/*
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
 
+# Ignore bundler config.
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp
+
+*.rbc
+*.sassc
+.sass-cache
+capybara-*.html
+.rspec
+/log
+/tmp
+/db/*.sqlite3
+/public/system
+/coverage/
+/spec/tmp
+**.orig
+rerun.txt
+pickle-email-*.html
+config/initializers/secret_token.rb
+config/secrets.yml
+
+config/database.yml
+config/deploy.rb
+
+## Environment normalisation:
+/.bundle
+/vendor/bundle
+
+# these should all be checked in to normalise the environment:
+# Gemfile.lock, .ruby-version, .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
\ No newline at end of file