X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.gitignore;h=5eca0e6b2f7f85e723397a01bcc95d6c7722fe00;hb=5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3;hp=0beb08c14e5efd7fe166be37c1b275d43bc42e39;hpb=2cdb0b8f4052f783fad53df3904a236c5edc9134;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.gitignore b/.gitignore
index 0beb08c1..5eca0e6b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1,48 @@
-/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
+
+# 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
+# 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/
+!app/Resources/static/lib
+app/Resources/static/lib/*
+/bin
+!/src/Wallabag/CoreBundle/Resources/public
+/src/Wallabag/CoreBundle/Resources/public/*