Merge pull request #4572 from lonvia/update-hosting-partners

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 73316769e63ae7989ff9507682a1011cdf9db21a..444dc99c9c1cc38a1184c75778de5e916fad7977 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,14 @@
 *~
 .DS_Store
 *~
 .DS_Store

+.bundle/config

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

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

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

-config/piwik.yml

 config/settings.local.yml
 config/settings/*.local.yml
 coverage
 config/settings.local.yml
 config/settings/*.local.yml
 coverage