Merge branch 'devops18_caoyanyi' into 'master'

* Modify test case for apiCreateBranchPriv. See merge request easycorp/zentaopms!1236
2021-12-31 07:54:26 +00:00
parent 86fb6e2680 401d793532
commit 41004048b2
2 changed files with 11 additions and 8 deletions
@@ -2539,7 +2539,8 @@ class gitlabModel extends model
     */
    public function apiCreateBranchPriv($gitlabID, $projectID, $priv)
    {
-        if(empty($gitlabID)) return false;
+        if(empty($gitlabID))   return false;
+        if(empty($projectID))  return false;
        if(empty($priv->name)) return false;
        $url = sprintf($this->getApiRoot($gitlabID), "/projects/" . $projectID . '/protected_branches');
        return json_decode(commonModel::http($url, $priv));