Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Revert "Merge branch 'sprint/devops16_liyuchun_45491' into 'master'"

Browse Source 
This reverts merge request !803
This commit is contained in:
李玉春
2021-12-07 08:50:57 +00:00
parent ff06288dc8
commit 3f2793e5bd
14 changed files with 9 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
-45
View File
@@ -896,24 +896,6 @@ class gitlabModel extends model
return json_decode(commonModel::http($url, array(), $options = array(CURLOPT_CUSTOMREQUEST => 'DELETE')));
}
/**
* Create a gitab user by api.
*
* @param int $gitlabID
* @param int $projectID
* @param object $branch
* @access public
* @return object
*/
public function apiCreateBranch($gitlabID, $projectID, $branch)
{
if(empty($branch->branch) or empty($branch->ref)) return false;
$apiRoot = $this->getApiRoot($gitlabID);
$url = sprintf($apiRoot, "/projects/{$projectID}/repository/branches");
return json_decode(commonModel::http($url, $branch));
}
/**
* Get single project by API.
*
@@ -2254,33 +2236,6 @@ class gitlabModel extends model
return $this->apiErrorHandling($reponse);
}
/**
* Create a gitlab branch.
*
* @param int $gitlabID
* @param int $projectID
* @access public
* @return bool
*/
public function createBranch($gitlabID, $projectID)
{
$branch = fixer::input('post')->get();
if(empty($branch->branch)) dao::$errors['branch'][] = $this->lang->gitlab->branch->name . $this->lang->gitlab->emptyError;
if(empty($branch->ref)) dao::$errors['ref'][] = $this->lang->gitlab->branch->from . $this->lang->gitlab->emptyError;
if(dao::isError()) return false;
$reponse = $this->apiCreateBranch($gitlabID, $projectID, $branch);
if(!empty($reponse->name))
{
$this->loadModel('action')->create('gitlabbranch', 0, 'created', '', $reponse->name);
return true;
}
return $this->apiErrorHandling($reponse);
}
/**
* Api error handling.
*