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..490a28a2f4 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; - } } /**