X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.gitignore;h=64831800d2694c36bbefec56df501d9eb7304453;hb=e4788de51ecbf2773a043325965e10eb74b14e8f;hp=0beb08c14e5efd7fe166be37c1b275d43bc42e39;hpb=569f8d6851ea31b594fc5ccbcc11fe79dbdf2fa6;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.gitignore b/.gitignore
index 0beb08c1..64831800 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +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
+# Composer PHAR
+/composer.phar
 
-!.gitignore
\ No newline at end of file
+# Data for wallabag
+data/assets/*
+data/db/poche.sqlite
\ No newline at end of file