diff --git a/module/ci/lang/en.php b/module/ci/lang/en.php index 97657af48f..c220f9ae75 100644 --- a/module/ci/lang/en.php +++ b/module/ci/lang/en.php @@ -1,6 +1,7 @@ ci->common = 'CI'; -$lang->ci->commitResult = 'Interface: Commit Test Result.'; +$lang->ci->common = 'CI'; +$lang->ci->commitResult = 'Interface: Commit Test Result.'; +$lang->ci->checkCompileStatus = 'Interface: Fetch Test Result.'; $lang->ci->job = 'Job'; $lang->ci->task = 'Task'; diff --git a/module/ci/lang/zh-cn.php b/module/ci/lang/zh-cn.php index 17fd9755c9..6617262317 100644 --- a/module/ci/lang/zh-cn.php +++ b/module/ci/lang/zh-cn.php @@ -1,6 +1,7 @@ ci->common = '持续集成'; -$lang->ci->commitResult = '接口:提交测试结果'; +$lang->ci->common = '持续集成'; +$lang->ci->commitResult = '接口:提交测试结果'; +$lang->ci->checkCompileStatus = '接口:获取测试结果'; $lang->ci->job = '构建'; $lang->ci->task = '构建任务'; diff --git a/module/ci/lang/zh-tw.php b/module/ci/lang/zh-tw.php index 6a983a797e..a3577d5f20 100644 --- a/module/ci/lang/zh-tw.php +++ b/module/ci/lang/zh-tw.php @@ -1,6 +1,7 @@ ci->common = '持續整合'; -$lang->ci->commitResult = '介面:提交測試結果'; +$lang->ci->common = '持續整合'; +$lang->ci->commitResult = '介面:提交測試結果'; +$lang->ci->checkCompileStatus = '介面:獲取測試結果'; $lang->ci->job = '構建'; $lang->ci->task = '構建任務'; diff --git a/module/common/model.php b/module/common/model.php index 97de423ed5..e2eec40243 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -1997,6 +1997,7 @@ EOD; { $httpType = (isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on') ? 'https' : 'http'; if(isset($_SERVER['HTTP_X_FORWARDED_PROTO']) and strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) == 'https') $httpType = 'https'; + if(isset($_SERVER['REQUEST_SCHEME']) and strtolower($_SERVER['REQUEST_SCHEME']) == 'https') $httpType = 'https'; $httpHost = $_SERVER['HTTP_HOST']; return "$httpType://$httpHost"; } diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index c2323e4594..1fc8b0f9be 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -977,9 +977,11 @@ $lang->repo->methodOrder[60] = 'download'; $lang->repo->methodOrder[65] = 'setRules'; $lang->resource->ci = new stdclass(); -$lang->resource->ci->commitResult = 'commitResult'; +$lang->resource->ci->commitResult = 'commitResult'; +$lang->resource->ci->checkCompileStatus = 'checkCompileStatus'; -$lang->ci->methodOrder[5] = 'commitResult'; +$lang->ci->methodOrder[5] = 'commitResult'; +$lang->ci->methodOrder[10] = 'checkCompileStatus'; $lang->resource->compile = new stdclass(); $lang->resource->compile->browse = 'browse'; @@ -1133,7 +1135,7 @@ $lang->resource->gitlab->importIssue = 'importIssue'; $lang->resource->gitlab->delete = 'delete'; $lang->resource->gitlab->bindUser = 'bindUser'; $lang->resource->gitlab->bindProduct = 'bindProduct'; -$lang->resource->gitlab->webhook = 'webhook'; +//$lang->resource->gitlab->webhook = 'webhook'; $lang->gitlab->methodOrder[5] = 'browse'; $lang->gitlab->methodOrder[10] = 'create'; @@ -1142,7 +1144,7 @@ $lang->gitlab->methodOrder[20] = 'importIssue'; $lang->gitlab->methodOrder[30] = 'delete'; $lang->gitlab->methodOrder[35] = 'bindUser'; $lang->gitlab->methodOrder[40] = 'bindProduct'; -$lang->gitlab->methodOrder[45] = 'webhook'; +//$lang->gitlab->methodOrder[45] = 'webhook'; /* Git. */ $lang->resource->git = new stdclass(); diff --git a/module/upgrade/control.php b/module/upgrade/control.php index 4135a97c49..f1d0f1bf7d 100644 --- a/module/upgrade/control.php +++ b/module/upgrade/control.php @@ -582,8 +582,6 @@ class upgrade extends control if(empty($repos)) { - $this->dao->delete()->from(TABLE_BLOCK)->exec(); - $this->dao->delete()->from(TABLE_CONFIG)->where('`key`')->eq('blockInited')->exec(); $this->loadModel('setting')->deleteItems('owner=system&module=common§ion=global&key=upgradeStep'); die(js::locate($this->createLink('upgrade', 'afterExec', "fromVersion=&processed=no"))); }