From 173629a4002de5091f41cad4891cca6c8490a7ca Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
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.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index ab8cac29..3d82770f 100644
--- a/build.xml
+++ b/build.xml
@@ -11,7 +11,7 @@
 
     <target name="composer" description="Install deps using Composer">
         <exec executable="composer">
-            <arg value="install"/>
+            <arg value="up"/>
             <arg value="--no-interaction"/>
             <arg value="--no-progress"/>
         </exec>
-- 
cgit v1.2.3