Merge branch 'adjust_mr' into 'zenops_41'

* Hide gogs mr.

See merge request easycorp/zentaopms!4773

module/gogs/view/browse.html.php

@@ -56,7 +56,6 @@
           <td class='c-actions'>
             <?php
             common::printIcon('gogs', 'edit', "gogsID=$id", '', 'list', 'edit');
-            echo common::buildIconButton('gogs', 'bindUser', "gogsID=$id", '', 'list', 'link', '', '', false, '', '', 0, $gogs->isBindUser);
             common::printIcon('gogs', 'delete', "gogsID=$id", '', 'list', 'trash', 'hiddenwin');
             ?>
           </td>

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();

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