From 7a12986ba10b9708eed18812c0b27f742842d68c Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Thu, 4 Aug 2022 08:42:57 +0800 Subject: [PATCH 1/2] * Hide gogs mr. --- module/gogs/view/browse.html.php | 1 - module/mr/control.php | 8 +------- module/mr/model.php | 8 -------- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/module/gogs/view/browse.html.php b/module/gogs/view/browse.html.php index d925058381..3916bd8fcf 100644 --- a/module/gogs/view/browse.html.php +++ b/module/gogs/view/browse.html.php @@ -56,7 +56,6 @@ isBindUser); common::printIcon('gogs', 'delete', "gogsID=$id", '', 'list', 'trash', 'hiddenwin'); ?> diff --git a/module/mr/control.php b/module/mr/control.php index 72fac0533e..33ea93a12b 100644 --- a/module/mr/control.php +++ b/module/mr/control.php @@ -109,19 +109,13 @@ class mr extends control $repo = $this->repo->getRepoByID($repoID); $this->loadModel('gitea'); - $this->loadModel('gogs'); if($repo->SCM == 'Gitea') { $project = $this->gitea->apiGetSingleProject($repo->gitService, $repo->project); if(empty($project) or !$project->allow_merge_commits) $repo = array(); } - elseif($repo->SCM == 'Gogs') - { - $project = $this->gitea->apiGetSingleProject($repo->gitService, $repo->project); - if(empty($project)) $repo = array(); - } - $hosts = $this->loadModel('pipeline')->getList(array('gitea', 'gitlab', 'gogs')); + $hosts = $this->loadModel('pipeline')->getList(array('gitea', 'gitlab')); if(!$this->app->user->admin) { $gitlabUsers = $this->loadModel('gitlab')->getGitLabListByAccount(); diff --git a/module/mr/model.php b/module/mr/model.php index 4b1e294035..ac9cd95b45 100644 --- a/module/mr/model.php +++ b/module/mr/model.php @@ -694,14 +694,6 @@ class mrModel extends model if(isset($mergeResult->merged) and $mergeResult->merged) $mergeResult->state = 'merged'; return $mergeResult; } - elseif($host->type == 'gogs') - { - $mergeResult = new stdClass(); - $mergeResult->iid = 0; - $mergeResult->merge_status = 'can_be_merged'; - $mergeResult->state = 'opened'; - return $mergeResult; - } } /** From 0b714797e9e35a557f39e0413b3a4c19b9d43e3c Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Thu, 4 Aug 2022 08:44:34 +0800 Subject: [PATCH 2/2] * Adjust code. --- module/mr/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/mr/control.php b/module/mr/control.php index 33ea93a12b..490a28a2f4 100644 --- a/module/mr/control.php +++ b/module/mr/control.php @@ -115,7 +115,7 @@ class mr extends control if(empty($project) or !$project->allow_merge_commits) $repo = array(); } - $hosts = $this->loadModel('pipeline')->getList(array('gitea', 'gitlab')); + $hosts = $this->loadModel('pipeline')->getList(array('gitea', 'gitlab')); if(!$this->app->user->admin) { $gitlabUsers = $this->loadModel('gitlab')->getGitLabListByAccount();