* Cancel GitLab SYNC Settings.

module/common/lang/menu.php

@@ -331,9 +331,6 @@ $lang->devops->menuOrder[20] = 'gitlab';
 $lang->devops->menuOrder[25] = 'jenkins';
 $lang->devops->menuOrder[30] = 'maintain';
 $lang->devops->menuOrder[35] = 'rules';
-
-$lang->devops->menu->mr['subMenu'] = new stdclass();
-$lang->devops->menu->mr['subMenu']->browse = array('link' => "{$lang->devops->settings}|mr|settings");
 /* Doc menu. */
 $lang->doc->menu = new stdclass();
 $lang->doc->menu->dashboard = array('link' => "{$lang->dashboard}|doc|index");

module/group/js/managepriv.js

@@ -5,8 +5,8 @@ function showPriv(value)
 
 /**
  * Control the actions select control for a module.
- * 
- * @param   string $module 
+ *
+ * @param   string $module
  * @access  public
  * @return  void
  */

module/group/view/managepriv.html.php

@@ -10,7 +10,7 @@
  * @link        http://www.zentao.net
  */
 ?>
-<?php 
+<?php
 include '../../common/view/header.html.php';
 if($type == 'byGroup')  include 'privbygroup.html.php';
 if($type == 'byModule') include 'privbymodule.html.php';

module/mr/control.php

@@ -32,17 +32,6 @@ class mr extends control
         $this->display();
     }
 
-    /**
-     * settings MR function.
-     *
-     * @access public
-     * @return void
-     */
-    public function settings()
-    {
-        $this->display();
-    }
-
     /**
      * Create MR function.
      *

module/mr/lang/zh-cn.php

@@ -28,9 +28,6 @@ $lang->mr->statusList['opened'] = '开放中';
 $lang->mr->statusList['closed'] = '已关闭';
 $lang->mr->statusList['merged'] = '已合并';
 
-$lang->mr->gitlabsever = 'GitLabSever';
-$lang->mr->projectname = '项目名称';
-
 $lang->mr->mergeStatusList = array();
 $lang->mr->mergeStatusList['checking']         = '检查中';
 $lang->mr->mergeStatusList['can_be_merged']    = '可合并';
@@ -77,8 +74,6 @@ $lang->mr->acceptMR       = "合并";
 $lang->mr->mergeFailed    = "无法合并，请核对合并请求状态";
 $lang->mr->mergeSuccess   = "已成功合并";
 
-$lang->mr->settings = '合并代码设置';
-$lang->mr->sync     = '设置同步';
 /**
  * Merge Command Document.
  *

module/mr/model.php

@@ -238,7 +238,6 @@ class mrModel extends model
         {
 
             $rawMR = $this->apiGetSingleMR($MR->gitlabID, $MR->targetProject, $MR->mriid);
-
             if(isset($rawMR->iid) and $rawMR->state != 'merged')
             {
                 /* create gitlab mr todo to zentao todo */