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

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

diff --git a/.gitignore b/.gitignore
index bb776458802d84f78d67ae1b3fcce6b8d454d975..797e0496cce0cc463d2e4c6354faf152c829233e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,60 @@
-/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
+.php_cs.cache
+
+# 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/.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/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/*
 
-/data/
+# Test-generated files
+admin-export.json
+specialexport.json
+/data/site-credentials-secret-key.txt
 
-/web/.htaccess
\ No newline at end of file
+# Custom CSS file
+web/custom.css