Install libarchive-dev for travis

[rails.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index e507f9430496225b457220ff16ca916d1ac319bf..5ba4bc764093feadbe0fe7ac4219e1f6089c1321 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,18 @@
-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

 public/assets
 public/attachments
 public/export
 tmp
 public/assets
 public/attachments
 public/export
 tmp

-.DS_Store
-*~
-doc
-.vagrant