X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.gitignore;h=3fbe668c98cf4e3a3d926407e52ba9110961d864;hb=68c6f1bd7fbf2f01730ee38b1291251494c80eb0;hp=c2c0f763a7f6e4e8d0ef4fd5e6ff9db808f0daed;hpb=b2d9357c78267bfa7a94d259769a1f8640035069;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.gitignore b/.gitignore
index c2c0f763..3fbe668c 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/
 
-/bin/
-!bin/install
-!bin/test
-!bin/symfony
+# Assets and user uploads
+/web/bundles/
+/web/uploads/
 
-data/assets/*
-data/db/poche.sqlite
+# PHPUnit
+/app/phpunit.xml
+/phpunit.xml
 
-/web/.htaccess
\ No newline at end of file
+# Composer PHAR
+/composer.phar
+
+# Data for wallabag
+data/assets/*
+data/db/poche*.sqlite