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

diff --git a/.gitignore b/.gitignore
index f596c7b8..797e0496 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@
 /bin/*
 !/bin/console
 !/bin/symfony_requirements
+.php_cs.cache
 
 # Parameters
 /app/config/parameters.yml
@@ -21,23 +22,39 @@
 /vendor/
 
 # Assets and user uploads
-/web/bundles/
-/web/uploads/
+web/uploads/
+/web/bundles/*
+!/web/bundles/.gitkeep
+/web/assets/images/*
+!web/assets/images/.gitkeep
+/web/wallassets/*.dev.js
 
 # Build
 /app/build
 /build
+/coverage
 
 # Composer PHAR
 /composer.phar
 
 # Data for wallabag
-data/assets/*
 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
+# assets stuff
+node_modules/
+bin
+app/Resources/build/
+!/src/Wallabag/CoreBundle/Resources/public
+/src/Wallabag/CoreBundle/Resources/public/*
+
+# Test-generated files
+admin-export.json
+specialexport.json
+/data/site-credentials-secret-key.txt
+
+# Custom CSS file
+web/custom.css