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

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 920ca1120ba51aa6171900e39560d36c48d1343f..17112bf8a48d4f21aea2c4a7c6c79fae37724f64 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 log
 config/piwik.yml
+app/assets/javascripts/i18n
 public/assets
 public/attachments
 public/export
@@ -12,3 +13,7 @@ doc
 .ruby-version
 .idea
 coverage
+
+config/settings.local.yml
+config/settings/*.local.yml
+config/environments/*.local.yml