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

diff --git a/.gitignore b/.gitignore
index c2c0f763..f596c7b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,43 @@
-/app/SymfonyRequirements.php
-/app/bootstrap.php.cache
-/app/check.php
-/app/cache/*
+# Cache, logs & sessions
+/var/*
+!/var/cache
+/var/cache/*
+!var/cache/.gitkeep
+!/var/logs
+/var/logs/*
+!var/logs/.gitkeep
+!/var/sessions
+/var/sessions/*
+!var/sessions/.gitkeep
+!var/SymfonyRequirements.php
+/bin/*
+!/bin/console
+!/bin/symfony_requirements
+
+# Parameters
 /app/config/parameters.yml
-/app/logs/*
-!app/cache/.gitkeep
-!app/logs/.gitkeep
-.idea
-.DS_Store
-.vagrant
+
+# Managed by Composer
 /vendor/
 
-/bin/
-!bin/install
-!bin/test
-!bin/symfony
+# Assets and user uploads
+/web/bundles/
+/web/uploads/
+
+# Build
+/app/build
+/build
 
+# Composer PHAR
+/composer.phar
+
+# Data for wallabag
 data/assets/*
-data/db/poche.sqlite
+data/db/wallabag*.sqlite
+
+# Docker container logs and data
+docker/logs/
+docker/data/
 
-/web/.htaccess
\ No newline at end of file
+# To avoid crazy stuff on some PR, we must manually FORCE ADD IT on each new release
+composer.lock