Merge branch 'pull/5145'

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index e5866532e5299d4815f527ae4bd2dc74c196680a..380a88047f9ad35e43edb8abe354958e78fdadbe 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,10 +2,13 @@
 .DS_Store
 .bundle/config
 .idea
 .DS_Store
 .bundle/config
 .idea

+.local-overcommit.yml

 .ruby-gemset
 .ruby-version
 .vagrant
 app/assets/javascripts/i18n
 .ruby-gemset
 .ruby-version
 .vagrant
 app/assets/javascripts/i18n

+config/credentials.yml.enc
+config/master.key

 config/environments/*.local.yml
 config/settings.local.yml
 config/settings/*.local.yml
 config/environments/*.local.yml
 config/settings.local.yml
 config/settings/*.local.yml