Merge branch 'jihuMR' of https://gitlab.zcorp.cc/easycorp/zentaopms into jihuMR

This commit is contained in:
lichengjun
2021-08-17 11:16:44 +00:00
5 changed files with 57 additions and 4 deletions
+2 -2
View File
@@ -305,8 +305,8 @@ class gitlabModel extends model
public function getRefOptions($gitlabID, $projectID)
{
$refList = array();
$branches = $this->loadModel('gitlab')->apiGetBranches($gitlabID, $projectID);
$tags = $this->loadModel('gitlab')->apiGetTags($gitlabID, $projectID);
$branches = $this->apiGetBranches($gitlabID, $projectID);
$tags = $this->apiGetTags($gitlabID, $projectID);
foreach($branches as $branch) $refList[] = "Branch::" . $branch->name;
foreach($tags as $tag) $refList[] = "Tag::" . $tag->name;
return $refList;