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

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 17112bf8a48d4f21aea2c4a7c6c79fae37724f64..5ba4bc764093feadbe0fe7ac4219e1f6089c1321 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,18 @@
-log
-config/piwik.yml
-app/assets/javascripts/i18n
-public/assets
-public/attachments
-public/export
-tmp
-.DS_Store

 *~
 *~

-doc
-.vagrant
+.DS_Store
+.idea

 .ruby-gemset
 .ruby-version
 .ruby-gemset
 .ruby-version

-.idea
-coverage
-
+.vagrant
+app/assets/javascripts/i18n
+config/environments/*.local.yml
+config/piwik.yml

 config/settings.local.yml
 config/settings/*.local.yml
 config/settings.local.yml
 config/settings/*.local.yml

-config/environments/*.local.yml
+coverage
+doc
+log
+public/assets
+public/attachments
+public/export
+tmp