Release wallabag 2.1.5

Prepare wallabag 2.1.5

.travis.yml

@@ -70,7 +70,7 @@ before_install:
     - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
 
 script:
-    - travis_wait bash composer install -o  --no-interaction --no-progress --prefer-dist
+    - travis_wait composer update --no-interaction --no-progress
     - ant prepare-$DB
     - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then phpunit -v ; fi;
     - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;

CHANGELOG.md

@@ -1,6 +1,15 @@
 ## Changelog
 
-### 2.1.4 2016/11/18
+### 2.1.5 2016/11/21
+- [#2623](https://github.com/wallabag/wallabag/pull/2623) Force composer to run as PHP 5.5.9 (@j0k3r)
+- [#2608](https://github.com/wallabag/wallabag/pull/2608) Change version to 2.2.0-dev (@nicosomb)
+- [#2607](https://github.com/wallabag/wallabag/pull/2607) Updated changelog for 2.1.4 (@nicosomb)
+
+### 2.1.4 2016/11/19
+- [#2604](https://github.com/wallabag/wallabag/pull/2604) wallabag can’t work on PostgreSQL <= 9.1 (@j0k3r)
+- [#2605](https://github.com/wallabag/wallabag/pull/2605) Add .travis.yml change to RELEASE_PROCESS (@j0k3r)
+- [#2603](https://github.com/wallabag/wallabag/pull/2603) Fix clear-cache problem using —no-dev (@j0k3r)
+- [#2596](https://github.com/wallabag/wallabag/pull/2596) Prepare wallabag 2.1.4 :rocket: (@nicosomb)
 - [#2550](https://github.com/wallabag/wallabag/pull/2550) Reordered documentation (@jlnostr, @nicosomb)
 - [#2578](https://github.com/wallabag/wallabag/pull/2578) Added help on config screen (@nicosomb)
 - [#2570](https://github.com/wallabag/wallabag/pull/2570) Added creation date on entries view (@nicosomb)

app/config/config.yml

@@ -30,7 +30,7 @@ framework:
     assets: ~
 
 wallabag_core:
-    version: 2.1.4
+    version: 2.1.5
     paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
     languages:
         en: 'English'

composer.json

@@ -88,7 +88,7 @@
         "doctrine/doctrine-fixtures-bundle": "~2.2",
         "doctrine/data-fixtures": "~1.1.1",
         "sensio/generator-bundle": "^3.0",
-        "phpunit/phpunit": "~5.0",
+        "phpunit/phpunit": "~4.0",
         "symfony/phpunit-bridge": "^3.0",
         "friendsofphp/php-cs-fixer": "~1.9",
         "m6web/redis-mock": "^2.0"
@@ -125,7 +125,10 @@
         "psr-4": { "Tests\\": "tests/" }
     },
     "config": {
-        "bin-dir": "bin"
+        "bin-dir": "bin",
+        "platform": {
+            "php": "5.5.9"
+        }
     },
     "minimum-stability": "dev",
     "prefer-stable": true