From 709007d043981a0a8256ab40fe03d705ad496b60 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Mon, 19 Feb 2018 22:18:47 +0100 Subject: Fix version check test Signed-off-by: VirtualTam --- CHANGELOG.md | 6 ++++++ tests/ApplicationUtilsTest.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51c60d4c..84dc18cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). +## [v0.8.6](https://github.com/shaarli/Shaarli/releases/tag/v0.8.5) - 2018-02-19 + +### Changed +- Run version check tests against the 'stable' branch + + ## [v0.8.5](https://github.com/shaarli/Shaarli/releases/tag/v0.8.5) - 2018-01-04 **XSS vulnerability fixed. Please update.** diff --git a/tests/ApplicationUtilsTest.php b/tests/ApplicationUtilsTest.php index 861b8d4e..4a0975bf 100644 --- a/tests/ApplicationUtilsTest.php +++ b/tests/ApplicationUtilsTest.php @@ -64,7 +64,7 @@ class ApplicationUtilsTest extends PHPUnit_Framework_TestCase self::$versionPattern, ApplicationUtils::getLatestGitVersionCode( 'https://raw.githubusercontent.com/shaarli/Shaarli/' - .'master/shaarli_version.php', + .'stable/shaarli_version.php', $testTimeout ) ); -- cgit v1.2.3 From c648fc34f882ca6a62f5a44d1826bbd2b9852845 Mon Sep 17 00:00:00 2001 From: VirtualTam Date: Mon, 19 Feb 2018 22:22:31 +0100 Subject: Bump Shaarli version to v0.8.6 Signed-off-by: VirtualTam --- index.php | 4 ++-- shaarli_version.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index 6060bd9e..8a0be951 100644 --- a/index.php +++ b/index.php @@ -1,6 +1,6 @@ /shaarli/ define('WEB_PATH', substr($_SERVER['REQUEST_URI'], 0, 1+strrpos($_SERVER['REQUEST_URI'], '/', 0))); diff --git a/shaarli_version.php b/shaarli_version.php index a7b8799a..4d882663 100644 --- a/shaarli_version.php +++ b/shaarli_version.php @@ -1 +1 @@ - + -- cgit v1.2.3