X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.gitignore;h=49ff72c6d6d3b7e38beb780b456f2ba4f5fe9d60;hb=0f2d24feb4709bf0ea97e6152e8a607aaa3c1c72;hp=32b0fbbb5db46047be70ff906dcfd8647dcaafb5;hpb=57386125abc5c50c1438cf7e78d01f06021adc0a;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.gitignore b/.gitignore
index 32b0fbbb..49ff72c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@
 /bin/*
 !/bin/console
 !/bin/symfony_requirements
+.php_cs.cache
 
 # Parameters
 /app/config/parameters.yml
@@ -22,9 +23,11 @@
 
 # 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
@@ -34,19 +37,20 @@ web/bundles/*
 /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