Merge branch 'devops_caoyanyi_gitlab' into 'devops21'

Devops caoyanyi gitlab See merge request easycorp/zentaopms!1736
2022-02-09 07:07:20 +00:00
parent ea2d66f7de 583dd0bcd8
commit ab5ddcf710
8 changed files with 34 additions and 10 deletions
@@ -252,6 +252,10 @@ class gitlab extends control

        if(!is_object($user)) return $this->send(array('result' => 'fail', 'message' => array('url' => array($this->lang->gitlab->hostError))));
        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. */
+        $result = $this->gitlab->getVersion($gitlabURL, $token);
+        if(empty($result) or !isset($result->version) or (version_compare($result->version, $this->config->gitlab->minCompatibleVersion, '<'))) return $this->send(array('result' => 'fail', 'message' => array('url' => array($this->lang->gitlab->notCompatible))));
    }

    /**