X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/083500f056f5b995f1979f88b37793046d9e4d37..aa9e9a5eb1a66c04a377f7f9f590f1c2e5e6592e:/.gitignore

diff --git a/.gitignore b/.gitignore
index 1a2d35c6a..5ba4bc764 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,18 @@
-log
-config/piwik.yml
+*~
+.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