X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.gitignore;h=64831800d2694c36bbefec56df501d9eb7304453;hb=367664ee87cbfb1bb318f71af84eb84cdbc11555;hp=db9ed4488a8eff1a28a75a1f0b5872ef9d151e92;hpb=33767049a5ce14f4327b0375d4e346268ad646e1;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.gitignore b/.gitignore
index db9ed448..64831800 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,38 @@
-/app/SymfonyRequirements.php
-/app/bootstrap.php.cache
-/app/check.php
+# Cache and logs (Symfony2)
 /app/cache/*
-/app/config/parameters.yml
 /app/logs/*
 !app/cache/.gitkeep
 !app/logs/.gitkeep
-.idea
-.DS_Store
-.vagrant
+
+# Cache and logs (Symfony3)
+/var/cache/*
+/var/logs/*
+!var/cache/.gitkeep
+!var/logs/.gitkeep
+
+# Parameters
+/app/config/parameters.yml
+/app/config/parameters.ini
+
+# Managed by Composer
+/app/bootstrap.php.cache
+/var/bootstrap.php.cache
+/bin/*
+!bin/console
+!bin/symfony_requirements
 /vendor/
-app/db/poche.sqlite
 
-/bin/
-!bin/install
-!bin/test
-!bin/symfony
+# Assets and user uploads
+/web/bundles/
+/web/uploads/
+
+# PHPUnit
+/app/phpunit.xml
+/phpunit.xml
 
-/data/*
+# Composer PHAR
+/composer.phar
 
-/web/.htaccess
\ No newline at end of file
+# Data for wallabag
+data/assets/*
+data/db/poche.sqlite
\ No newline at end of file