-/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/uploads/
+!web/bundles
+web/bundles/*
+!web/bundles/wallabagcore
+/web/assets/images/*
+!web/assets/images/.gitkeep
+
+# Build
+/app/build
+/build
+
+# Composer PHAR
+/composer.phar
+
+# Data for wallabag
+data/db/wallabag*.sqlite
-data/assets/*
-data/db/poche.sqlite
+# Docker container logs and data
+docker/logs/
+docker/data/
-/web/.htaccess
+# To avoid crazy stuff on some PR, we must manually FORCE ADD IT on each new release
+composer.lock
-!.gitignore
\ No newline at end of file
+# assets stuff
+node_modules/
+bin
+app/Resources/build/
+!/src/Wallabag/CoreBundle/Resources/public
+/src/Wallabag/CoreBundle/Resources/public/*