X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.gitignore;h=797e0496cce0cc463d2e4c6354faf152c829233e;hb=HEAD;hp=0bcbabb8c585339c0b8e197605a04b12e7c13b18;hpb=69803049688179e1b03ef424dec91f1b9a4f9e91;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.gitignore b/.gitignore
index 0bcbabb8..797e0496 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@
 /bin/*
 !/bin/console
 !/bin/symfony_requirements
+.php_cs.cache
 
 # Parameters
 /app/config/parameters.yml
@@ -22,15 +23,16 @@
 
 # Assets and user uploads
 web/uploads/
-!web/bundles
-web/bundles/*
-!web/bundles/wallabagcore
+/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
@@ -42,9 +44,6 @@ data/db/wallabag*.sqlite
 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
@@ -55,3 +54,7 @@ app/Resources/build/
 # Test-generated files
 admin-export.json
 specialexport.json
+/data/site-credentials-secret-key.txt
+
+# Custom CSS file
+web/custom.css