Merge pull request #4438 from wallabag/dependabot/composer/scheb/two-factor-bundle...

[github/wallabag/wallabag.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3fbe668c98cf4e3a3d926407e52ba9110961d864..797e0496cce0cc463d2e4c6354faf152c829233e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,38 +1,60 @@
-# Cache and logs (Symfony2)
-/app/cache/*
-/app/logs/*
-!app/cache/.gitkeep
-!app/logs/.gitkeep
-
-# Cache and logs (Symfony3)
+# Cache, logs & sessions
+/var/*
+!/var/cache
 /var/cache/*
-/var/logs/*
 !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
+.php_cs.cache
 
 # Parameters
 /app/config/parameters.yml
-/app/config/parameters.ini
 
 # Managed by Composer
-/app/bootstrap.php.cache
-/var/bootstrap.php.cache
-/bin/*
-!bin/console
-!bin/symfony_requirements
 /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
 
-# PHPUnit
-/app/phpunit.xml
-/phpunit.xml
+# Build
+/app/build
+/build
+/coverage
 
 # 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/
+
+# 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