]> git.openstreetmap.org Git - rails.git/blobdiff - .gitignore
Merge remote-tracking branch 'upstream/pull/2661'
[rails.git] / .gitignore
index 837249e00a04b432e8b8577d1d5be5b21a149c44..1328658c6ab5b70d2809f6c665e51ff05b447514 100644 (file)
@@ -1,9 +1,20 @@
-log
+*~
+.DS_Store
+.idea
+.ruby-gemset
+.ruby-version
+.vagrant
+app/assets/javascripts/i18n
+config/environments/*.local.yml
 config/piwik.yml
 config/piwik.yml
+config/settings.local.yml
+config/settings/*.local.yml
+coverage
+doc
+log
+node_modules
 public/assets
 public/attachments
 public/export
 public/assets
 public/attachments
 public/export
+storage
 tmp
 tmp
-.DS_Store
-*~
-doc