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

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 1a2d35c6a28cc056de2646690384138a52a03caf..17112bf8a48d4f21aea2c4a7c6c79fae37724f64 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,7 @@ doc
 .ruby-version
 .idea
 coverage
+
+config/settings.local.yml
+config/settings/*.local.yml
+config/environments/*.local.yml