X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e0abb299d01097a5469a7e72b2e63194e0cc6003..5a5aa5f880ba1ccb3d610e8da8bd9ece4b11c77b:/.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