Merge tag 'v1.5.6'

# Conflicts:
#	Source/MantisSourceBase.class.php
#	SourceGitlab/SourceGitlab.php
#	docs/CHANGELOG.md

Author: dregad

SourceGitlab/SourceGitlab.php

@@ -13,9 +13,15 @@
 
 class SourceGitlabPlugin extends MantisSourceGitBasePlugin {
 
-	const PLUGIN_VERSION = '2.0.1';
+	const PLUGIN_VERSION = '2.0.2';
 	const FRAMEWORK_VERSION_REQUIRED = '2.0.0';
 
+    /**
+     * GitLab API version, used to build the API URI
+     * @see api_uri()
+     */
+    const API_VERSION = 'v4';
+
 	public function register() {
 		$this->name = plugin_lang_get( 'title' );
 		$this->description = plugin_lang_get( 'description' );
@@ -183,7 +189,7 @@ public function update_repo( $p_repo ) {
 
 	private function api_uri( $p_repo, $p_path ) {
 		$t_root = $p_repo->info['hub_root'];
-		$t_uri = $t_root . '/api/v3/' . $p_path;
+		$t_uri = $t_root . '/api/' . self::API_VERSION . '/' . $p_path;
 
 		if( isset( $p_repo->info['hub_app_secret'] ) ) {
 			$t_access_token = $p_repo->info['hub_app_secret'];

docs/CHANGELOG.md

@@ -145,6 +145,13 @@ Includes all changes and fixes from 1.5.0.
 
 # Releases for MantisBT 1.3
 
+## [1.5.6] - 2018-06-13
+
+### Fixed
+
+- GitLab: use API v4
+  [#270](https://github.com/mantisbt-plugins/source-integration/pull/270)
+
 ## [1.5.5] - 2018-04-09
 
 ### Fixed
@@ -339,7 +346,7 @@ Includes all changes and fixes from master-1.2.x branch, up to commit
 
 
 [Unreleased 2.x]: https://github.com/mantisbt-plugins/source-integration/compare/v2.1.1...HEAD
-[Unreleased 1.x]: https://github.com/mantisbt-plugins/source-integration/compare/v1.5.5...master-1.3.x
+[Unreleased 1.x]: https://github.com/mantisbt-plugins/source-integration/compare/v1.5.6...master-1.3.x
 
 [2.1.1]: https://github.com/mantisbt-plugins/source-integration/compare/v2.1.0...v2.1.1
 [2.1.0]: https://github.com/mantisbt-plugins/source-integration/compare/v2.0.3...v2.1.0
@@ -350,6 +357,7 @@ Includes all changes and fixes from master-1.2.x branch, up to commit
 [2.0.0-beta.2]: https://github.com/mantisbt-plugins/source-integration/compare/v2.0.0-beta.1...v2.0.0-beta.2
 [2.0.0-beta.1]: https://github.com/mantisbt-plugins/source-integration/compare/v1.5.2...v2.0.0-beta.1
 
+[1.5.6]: https://github.com/mantisbt-plugins/source-integration/compare/v1.5.5...v1.5.6
 [1.5.5]: https://github.com/mantisbt-plugins/source-integration/compare/v1.5.4...v1.5.5
 [1.5.4]: https://github.com/mantisbt-plugins/source-integration/compare/v1.5.3...v1.5.4
 [1.5.3]: https://github.com/mantisbt-plugins/source-integration/compare/v1.5.2...v1.5.3