Merge remote-tracking branch 'upstream/pull/4392'

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index e5866532e5299d4815f527ae4bd2dc74c196680a..444dc99c9c1cc38a1184c75778de5e916fad7977 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,8 @@
 .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