From 6546aca4a3a54ec61c3b43e84aa948efb1aeca95 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 29 May 2019 11:41:07 +0200 Subject: Keep composer.lock We initially ignored the `composer.lock` because it generated a lock of rebase on PR when someone updated it and the master updated it too. Now we have less contributions (sadly) so I think we won't run against that problem. Also, it'll solve issue about people cloning the master and got angry because composer eat all the available memory to determine packages to install. It'll also be much easier to make release. Scrutinizer & Travis will be faster too. --- .gitignore | 3 --- 1 file changed, 3 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 472c7ad9..49ff72c6 100644 --- a/.gitignore +++ b/.gitignore @@ -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 -- cgit v1.2.3