From b74462aa35531ddcbd509de37169d8b6125e4085 Mon Sep 17 00:00:00 2001 From: lichengjun Date: Fri, 23 Jul 2021 11:05:18 +0800 Subject: [PATCH 01/22] * Fix gitlabpipeline module code format. --- module/gitlabpipeline/model.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/module/gitlabpipeline/model.php b/module/gitlabpipeline/model.php index 1959355a09..7b7ba8a17a 100644 --- a/module/gitlabpipeline/model.php +++ b/module/gitlabpipeline/model.php @@ -16,6 +16,7 @@ class gitlabpipelineModel extends model /** * Get single pipline by api. * + * @param integer $gitlabID * @param integer $projectID * @param integer $pipelineID * @access public @@ -32,6 +33,7 @@ class gitlabpipelineModel extends model /** * Get piplines list by api. * + * @param integer $gitlabID * @param integer $projectID * @access public * @return object @@ -47,6 +49,7 @@ class gitlabpipelineModel extends model /** * Get a pipeline’s report by api. * + * @param integer $gitlabID * @param integer $projectID * @param integer $pipelineID * @access public @@ -62,6 +65,7 @@ class gitlabpipelineModel extends model /** * Create a new pipeline by api. * + * @param integer $gitlabID * @param integer $projectID * @param string $reference * @access public @@ -77,6 +81,7 @@ class gitlabpipelineModel extends model /** * Retry jobs in a pipeline by api. * + * @param integer $gitlabID * @param integer $projectID * @param integer $pipelineID * @return object @@ -91,12 +96,13 @@ class gitlabpipelineModel extends model /** * Cancel a pipeline’s jobs by api. * + * @param integer $gitlabID * @param integer $projectID * @param integer $pipelineID * @return object * @docment https://docs.gitlab.com/ee/api/pipelines.html#cancel-a-pipelines-jobs */ - public function apiPipelineCancel($$gitlabID, $projectID, $piplineID) + public function apiPipelineCancel($gitlabID, $projectID, $piplineID) { $url = sprintf($this->loadModel('gitlab')->getApiRoot($gitlabID), "/projects/{$projectID}/pipelines/{$pipelineID}/cancel"); return json_decode(commonModel::http($url)); @@ -105,6 +111,7 @@ class gitlabpipelineModel extends model /** * Delete a pipeline-·· by api. * + * @param integer $gitlabID * @param integer $projectID * @param integer $pipelineID * @return object @@ -119,6 +126,7 @@ class gitlabpipelineModel extends model /** * Get all pipeline schedules by api. * + * @param integer $gitlabID * @param integer $projectID * @return object * @docment https://docs.gitlab.com/ee/api/pipeline_schedules.html#get-all-pipeline-schedules @@ -132,6 +140,7 @@ class gitlabpipelineModel extends model /** * Delete a pipeline schedule by api. * + * @param integer $gitlabID * @param integer $projectID * @param integer $pipelineScheduleID * @return object @@ -146,6 +155,7 @@ class gitlabpipelineModel extends model /** * Run a scheduled pipeline immediately by api. * + * @param integer $gitlabID * @param integer $projectID * @param integer $pipelineScheduleID * @return object @@ -160,6 +170,7 @@ class gitlabpipelineModel extends model /** * Get a log file by api. * + * @param integer $gitlabID * @param integer $projectID * @param integer $jobID * @return object @@ -174,6 +185,7 @@ class gitlabpipelineModel extends model /** * List pipeline jobs by api. * + * @param integer $gitlabID * @param integer $projectID * @param integer $pipelineID * @return object @@ -188,6 +200,7 @@ class gitlabpipelineModel extends model /** * Get a single job by api. * + * @param integer $gitlabID * @param integer $projectID * @param integer $jobID * @return object From 44232d39255e3d9e8652215864306e8944d0bce1 Mon Sep 17 00:00:00 2001 From: holan20180123 Date: Fri, 23 Jul 2021 11:15:00 +0800 Subject: [PATCH 02/22] * Finish task #40500. --- module/doc/css/objectlibs.css | 1 + module/doc/view/content.html.php | 2 +- module/index/view/index.html.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module/doc/css/objectlibs.css b/module/doc/css/objectlibs.css index 7b016bd863..63bd24dc78 100644 --- a/module/doc/css/objectlibs.css +++ b/module/doc/css/objectlibs.css @@ -29,3 +29,4 @@ .main-col iframe {min-height: 380px;} .menu-actions {position: absolute; top: 0; right: 0; padding: 7px 8px;} .menu-actions i {font-size: 15px; color: #8c8c8c;} +.article-content .keywords {margin-bottom: 15px;} diff --git a/module/doc/view/content.html.php b/module/doc/view/content.html.php index 1809005894..ccf85db4f5 100644 --- a/module/doc/view/content.html.php +++ b/module/doc/view/content.html.php @@ -67,7 +67,7 @@ $sessionString .= session_name() . '=' . session_id();
keywords):?> -

+

keywords as $keywords):?> $keywords";?> diff --git a/module/index/view/index.html.php b/module/index/view/index.html.php index c81c19bb92..76323ca630 100644 --- a/module/index/view/index.html.php +++ b/module/index/view/index.html.php @@ -68,7 +68,7 @@ js::set('defaultOpen', $open);