diff options
| -rw-r--r-- | .gitignore | 33 | ||||
| -rw-r--r-- | config/database.yml.sample (renamed from config/database.yml) | 0 |
2 files changed, 21 insertions, 12 deletions
@@ -1,16 +1,25 @@ -# 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' +*.rbc +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 -# Ignore bundler config. +## Environment normalisation: /.bundle +/vendor/bundle -# Ignore the default SQLite database. -/db/*.sqlite3 -/db/*.sqlite3-journal +# these should all be checked in to normalise the environment: +# Gemfile.lock, .ruby-version, .ruby-gemset -# Ignore all logfiles and tempfiles. -/log/*.log -/tmp +# unless supporting rvm < 1.11.0 or doing something fancy, ignore this: +.rvmrc diff --git a/config/database.yml b/config/database.yml.sample index d34cefa..d34cefa 100644 --- a/config/database.yml +++ b/config/database.yml.sample |