Keep composer.lock

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

diff --git a/.gitignore b/.gitignore
index 709f78cf248708646b86c8bae907360722184e54..49ff72c6d6d3b7e38beb780b456f2ba4f5fe9d60 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@
 /bin/*
 !/bin/console
 !/bin/symfony_requirements
+.php_cs.cache
 
 # Parameters
 /app/config/parameters.yml
@@ -22,12 +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/bundles/wallabagcore/*.dev.js
+/web/wallassets/*.dev.js
 
 # Build
 /app/build
@@ -43,9 +43,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
@@ -56,3 +53,4 @@ app/Resources/build/
 # Test-generated files
 admin-export.json
 specialexport.json
+/data/site-credentials-secret-key.txt