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

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index e507f9430496225b457220ff16ca916d1ac319bf..1328658c6ab5b70d2809f6c665e51ff05b447514 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,20 @@
-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
+node_modules
 public/assets
 public/attachments
 public/export
+storage
 tmp
-.DS_Store
-*~
-doc
-.vagrant