From 173629a4002de5091f41cad4891cca6c8490a7ca Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Wed, 20 Jan 2016 18:49:45 +0100 Subject: Ignore composer.lock Having a big composer.lock on a final project can have side effect on incoming PR that add a new vendor. Mostly because conflict are too frequent. By ignoring composer.lock we ease the PR submission and rebase. BUT we need to be careful when we release a new version of wallabag. We should manually `git add -f composer.lock` to update it. Since composer.lock will no longer be commited I switch the `composer install` to a `composer up` in the travis configuration. --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index b6d6aa5d..02e921f8 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,6 @@ data/db/wallabag*.sqlite # 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 -- cgit v1.2.3