X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.gitignore;h=0bcbabb8c585339c0b8e197605a04b12e7c13b18;hb=ab9eb5cdb767510c0c2b9d1b114243741f748f89;hp=85a3fab83bd15f30deef90ed6b2e7ceb484e4e86;hpb=dc61832a9e741e346d7d9272fe8224699b3f32aa;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.gitignore b/.gitignore
index 85a3fab8..0bcbabb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,23 +1,57 @@
-/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/
-app/db/poche.sqlite
 
-/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
+
+# Docker container logs and data
+docker/logs/
+docker/data/
+
+# To avoid crazy stuff on some PR, we must manually FORCE ADD IT on each new release
+composer.lock
 
-data/assets/*
-data/db/poche.sqlite
+# assets stuff
+node_modules/
+bin
+app/Resources/build/
+!/src/Wallabag/CoreBundle/Resources/public
+/src/Wallabag/CoreBundle/Resources/public/*
 
-/web/.htaccess
\ No newline at end of file
+# Test-generated files
+admin-export.json
+specialexport.json