summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Henrik Mai <lars.mai@kontinui.de>2014-03-29 12:17:16 +0100
committerLars Henrik Mai <lars.mai@kontinui.de>2014-03-29 12:17:16 +0100
commit90121413900895958a2ed8daaae2ab1e7dde996d (patch)
tree47458488128aacf75c00fe76f8cb575a825f2365
parent14c7423a5c570143d84866754ca6f4d95dcfd562 (diff)
gitignore database config
-rw-r--r--.gitignore33
-rw-r--r--config/database.yml.sample (renamed from config/database.yml)0
2 files changed, 21 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore
index 6a502e9..d3aed67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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