diff --git a/module/gitlab/model.php b/module/gitlab/model.php index f83126aaaf..9c0e529751 100644 --- a/module/gitlab/model.php +++ b/module/gitlab/model.php @@ -1020,16 +1020,17 @@ class gitlabModel extends model /** * Get single project by API. * - * @param int $gitlabID - * @param int $projectID + * @param int $gitlabID + * @param int $projectID + * @param bool $useUser * @access public * @return object */ - public function apiGetSingleProject($gitlabID, $projectID) + public function apiGetSingleProject($gitlabID, $projectID, $useUser = false) { if(isset($this->projects[$gitlabID][$projectID])) return $this->projects[$gitlabID][$projectID]; - $url = sprintf($this->getApiRoot($gitlabID, false), "/projects/$projectID"); + $url = sprintf($this->getApiRoot($gitlabID, $useUser), "/projects/$projectID"); $this->projects[$gitlabID][$projectID] = json_decode(commonModel::http($url, $data = null, $optionsi = array(), $headers = array(), $dataType = 'data', $method = 'POST', $timeout = 30, $httpCode = false, $log = false)); return $this->projects[$gitlabID][$projectID]; } diff --git a/module/mr/control.php b/module/mr/control.php index 503fd7c6cc..6d5f6e3b4d 100644 --- a/module/mr/control.php +++ b/module/mr/control.php @@ -960,7 +960,7 @@ class mr extends control $projects = $scm == 'gitlab' ? $this->$scm->apiGetForks($hostID, $projectID) : array(); /* Second step: get project itself. */ - $projects[] = $this->$scm->apiGetSingleProject($hostID, $projectID); + $projects[] = $this->$scm->apiGetSingleProject($hostID, $projectID, true); /* Last step: find its upstream recursively. */ $project = $this->$scm->apiGetUpstream($hostID, $projectID);