X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.gitignore;h=3fbe668c98cf4e3a3d926407e52ba9110961d864;hb=91f78f26f2594db3f21c712f3ec30e4d06283dff;hp=b73c4b400f41d8be0e926b9b52f8616b8033b4b7;hpb=79026b73a804d1fe3715c3edf5bc2cfb1e56732c;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.gitignore b/.gitignore
index b73c4b40..3fbe668c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,38 @@
-assets/*
-cache/*
-vendor
-composer.phar
-db/poche.sqlite
-output
-phpdoc*
-inc/poche/config.inc.php
\ No newline at end of file
+# Cache and logs (Symfony2)
+/app/cache/*
+/app/logs/*
+!app/cache/.gitkeep
+!app/logs/.gitkeep
+
+# 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/
+
+# Assets and user uploads
+/web/bundles/
+/web/uploads/
+
+# PHPUnit
+/app/phpunit.xml
+/phpunit.xml
+
+# Composer PHAR
+/composer.phar
+
+# Data for wallabag
+data/assets/*
+data/db/poche*.sqlite