X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=.gitignore;h=32b0fbbb5db46047be70ff906dcfd8647dcaafb5;hb=ab0c93769b0d2cd2650a59dff2f3d7d6eaedba57;hp=273b380f54b4dab48b98d78a5d34618fe7ea91ad;hpb=ceb79aa016becb91132c0a96405f40153f7da77a;p=github%2Fwallabag%2Fwallabag.git

diff --git a/.gitignore b/.gitignore
index 273b380f..32b0fbbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,30 +1,30 @@
-# 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
 
 # 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/*
+!web/bundles/wallabagcore
 
 # Build
 /app/build
@@ -37,7 +37,16 @@
 data/assets/*
 data/db/wallabag*.sqlite
 
-# Capistrano
-/config/deploy.rb
-/config/deploy/production.rb
-/config/deploy/staging.rb
+# 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/*