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

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 920ca1120ba51aa6171900e39560d36c48d1343f..5ba4bc764093feadbe0fe7ac4219e1f6089c1321 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,18 @@
-log
+*~
+.DS_Store
+.idea
+.ruby-gemset
+.ruby-version
+.vagrant
+app/assets/javascripts/i18n
+config/environments/*.local.yml
 config/piwik.yml
+config/settings.local.yml
+config/settings/*.local.yml
+coverage
+doc
+log
 public/assets
 public/attachments
 public/export
 tmp
-.DS_Store
-*~
-doc
-.vagrant
-.ruby-gemset
-.ruby-version
-.idea
-coverage