]> git.immae.eu Git - github/wallabag/wallabag.git/commit - .gitignore
Ignore composer.lock 1607/head
authorJeremy Benoist <jeremy.benoist@gmail.com>
Wed, 20 Jan 2016 17:49:45 +0000 (18:49 +0100)
committerJeremy Benoist <jeremy.benoist@gmail.com>
Wed, 20 Jan 2016 17:49:45 +0000 (18:49 +0100)
commit173629a4002de5091f41cad4891cca6c8490a7ca
tree914c7184d511b4e70d9d6b8f9dea2b406ba67f0f
parentd481f42b7d383eb6211d1d3049d1a2c8288d9edb
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
build.xml