diff --git a/module/repo/lang/zh-cn.php b/module/repo/lang/zh-cn.php index 8dbdf28398..9a0bf77497 100644 --- a/module/repo/lang/zh-cn.php +++ b/module/repo/lang/zh-cn.php @@ -131,9 +131,9 @@ $lang->repo->scmList['Gitlab'] = 'Gitlab'; $lang->repo->scmList['Subversion'] = 'Subversion'; $lang->repo->scmList['Gitlab'] = 'Gitlab'; -$lang->repo->gitlabHost = 'Gitlab 地址'; -$lang->repo->gitlabToken = 'Gitlab Token'; -$lang->repo->gitlabProject = '项目'; +$lang->repo->gitlabHost = 'GitLab Sever'; +$lang->repo->gitlabToken = 'GitLab Token'; +$lang->repo->gitlabProject = 'GitLab 项目'; $lang->repo->placeholder = new stdclass; $lang->repo->placeholder->gitlabHost = '请填写gitlab访问地址'; diff --git a/module/repo/model.php b/module/repo/model.php index 7be326bdc2..fc733a6a55 100644 --- a/module/repo/model.php +++ b/module/repo/model.php @@ -262,12 +262,6 @@ class repoModel extends model ->join('product', ',') ->get(); - if($this->post->SCM == 'Gitlab') - { - $data->path = sprintf($this->config->repo->gitlab->apiPath, $data->gitlabHost, $this->post->gitlabProject); - $data->prefix = ''; - } - if($data->path != $repo->path) $data->synced = 0; $data->acl = empty($data->acl) ? '' : json_encode($data->acl);