Merge branch 'devops_cyy' into 'devops21'

* Modify host check.

See merge request easycorp/zentaopms!1760
This commit is contained in:
李玉春
2022-02-11 01:22:36 +00:00
+1 -1
View File
@@ -250,7 +250,7 @@ class gitlab extends control
$user = $this->gitlab->apiGetCurrentUser($gitlabURL, $token, true);
if(!is_object($user)) return $this->send(array('result' => 'fail', 'message' => array('url' => array($this->lang->gitlab->hostError))));
if(!is_object($user)) return $this->send(array('result' => 'fail', 'message' => array('url' => array(sprintf($this->lang->gitlab->hostError, $this->config->gitlab->minCompatibleVersion)))));
if(!isset($user->is_admin) or !$user->is_admin) return $this->send(array('result' => 'fail', 'message' => array('token' => array($this->lang->gitlab->tokenError))));
/* Verify version compatibility. */