diff --git a/db/update15.7.1.sql b/db/update15.7.1.sql
index b46375e19e..726396cc1a 100644
--- a/db/update15.7.1.sql
+++ b/db/update15.7.1.sql
@@ -116,6 +116,17 @@ CREATE TABLE IF NOT EXISTS `zt_holiday` (
   KEY `name` (`name`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
+-- DROP TABLE IF EXISTS `zt_mrapproval`;
+CREATE TABLE IF NOT EXISTS `zt_mrapproval` (
+  `id` mediumint(8) unsigned NOT NULL AUTO_INCREMENT,
+  `mrID` mediumint(8) unsigned NOT NULL,
+  `account` varchar(255) NOT NULL,
+  `date` datetime NOT NULL,
+  `action` char(30) NOT NULL,
+  `comment` text NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
 REPLACE INTO `zt_stage` (`name`,`percent`,`type`,`createdBy`,`createdDate`,`editedBy`,`editedDate`,`deleted`) VALUES
 ('需求','10','request','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'),
 ('设计','10','design','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'),
diff --git a/lib/scm/gitlab.class.php b/lib/scm/gitlab.class.php
index 40978f234f..1730ea27ce 100644
--- a/lib/scm/gitlab.class.php
+++ b/lib/scm/gitlab.class.php
@@ -559,6 +559,7 @@ class gitlab
         $list = $this->fetch($api, $params);
 
         $commits = array();
+        $files   = array();
         foreach($list as $commit)
         {
             if(!is_object($commit)) continue;
diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index 0f6fc866d6..c42c150ec2 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -921,7 +921,7 @@ $(function()
     {
         $.get(createLink('execution', 'ajaxUpdateKanban', "executionID=" + executionID + "&entertime=" + entertime + "&browseType=" + browseType + "&groupBy=" + groupBy), function(data)
         {
-            if(data && lastUpdateData !== lastUpdateData)
+            if(data && lastUpdateData !== data)
             {
                 lastUpdateData = data;
                 kanbanGroup = $.parseJSON(data);
diff --git a/module/gitlab/lang/en.php b/module/gitlab/lang/en.php
index 293201b188..75fb0e0dd1 100644
--- a/module/gitlab/lang/en.php
+++ b/module/gitlab/lang/en.php
@@ -7,7 +7,7 @@ $lang->gitlab->create            = 'Create GitLab';
 $lang->gitlab->edit              = 'Edit GitLab';
 $lang->gitlab->view              = 'View GitLab';
 $lang->gitlab->bindUser          = 'Bind User';
-$lang->gitlab->webhook           = 'webhook';
+$lang->gitlab->webhook           = 'Webhook';
 $lang->gitlab->bindProduct       = 'Import Product';
 $lang->gitlab->importIssue       = 'Import Issue';
 $lang->gitlab->delete            = 'Delete GitLab';
diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php
index fd4f9b449a..c6720eb628 100644
--- a/module/gitlab/lang/zh-cn.php
+++ b/module/gitlab/lang/zh-cn.php
@@ -7,7 +7,7 @@ $lang->gitlab->create            = '添加GitLab';
 $lang->gitlab->edit              = '编辑GitLab';
 $lang->gitlab->view              = '查看GitLab';
 $lang->gitlab->bindUser          = '绑定用户';
-$lang->gitlab->webhook           = 'webhook';
+$lang->gitlab->webhook           = 'Webhook';
 $lang->gitlab->bindProduct       = '关联产品';
 $lang->gitlab->importIssue       = '关联issue';
 $lang->gitlab->delete            = '删除GitLab';
@@ -19,7 +19,7 @@ $lang->gitlab->binded            = '已绑定';
 $lang->gitlab->serverFail        = '连接GitLab服务器异常，请检查GitLab服务器。';
 $lang->gitlab->lastUpdate        = '最后更新';
 $lang->gitlab->confirmAddWebhook = '您确定创建Webhook吗？';
-$lang->gitlab->addWebhookSuccess = 'webhook创建成功';
+$lang->gitlab->addWebhookSuccess = 'Webhook创建成功';
 $lang->gitlab->failCreateWebhook = 'Webhook创建失败，请查看日志';
 $lang->gitlab->placeholderSearch = '请输入项目名称';
 
diff --git a/module/mr/control.php b/module/mr/control.php
index 136e4c4a63..9e484e791d 100644
--- a/module/mr/control.php
+++ b/module/mr/control.php
@@ -400,7 +400,10 @@ class mr extends control
     public function close($MRID)
     {
         $MR = $this->mr->getByID($MRID);
-        return $this->send($this->mr->close($MR));
+        $result = $this->mr->close($MR);
+
+        if($result['result'] == 'fali') return $this->send($result);
+        die(js::locate($result['locate'], 'parent'));
     }
 
     /**
diff --git a/module/mr/view/view.html.php b/module/mr/view/view.html.php
index fa40b82729..7b1b1f5a3e 100644
--- a/module/mr/view/view.html.php
+++ b/module/mr/view/view.html.php
@@ -103,7 +103,7 @@
           <div class="btn-toolbar">
             <?php common::printBack(inlink('browse', '')); ?>
             <?php $acceptDisabled = ($MR->approvalStatus != 'approved' or ($MR->compileID !=0 and $MR->compileStatus != 'success')) ? ' disabled' : ''; ?>
-            <?php if($rawMR->state == 'opened' and !$rawMR->has_conflicts) echo html::a(inlink('accept', "mr=$MR->id", '', true), '<i class="icon icon-flow"></i> ' . $lang->mr->acceptMR, '', "id='mergeButton' class='btn' $acceptDisabled"); ?>
+            <?php if($rawMR->state == 'opened' and !$rawMR->has_conflicts) echo html::a(inlink('accept', "mr=$MR->id"), '<i class="icon icon-flow"></i> ' . $lang->mr->acceptMR, '', "id='mergeButton' class='btn' $acceptDisabled"); ?>
             <?php if($rawMR->state == 'opened'): ?>
               <?php if($rawMR->has_conflicts or ($MR->compileID !=0 and $MR->compileStatus != 'success') or $MR->approvalStatus == 'approved'):?>
               <?php echo html::a(inlink('approval', "mr=$MR->id&action=approve", '', true), '<i class="icon icon-ok"></i> ' . $lang->mr->approve, '', "id='mergeButton' class='btn iframe showinonlybody' disabled"); ?>
@@ -111,7 +111,7 @@
               <?php echo html::a(inlink('approval', "mr=$MR->id&action=approve", '', true), '<i class="icon icon-ok"></i> ' . $lang->mr->approve, '', "id='mergeButton' class='btn iframe showinonlybody'"); ?>
               <?php endif;?>
               <?php echo html::a(inlink('approval', "mr=$MR->id&action=reject", '', true), '<i class="icon icon-bug"></i> ' . $lang->mr->reject, '', "id='mergeButton' class='btn iframe showinonlybody'" . ($MR->approvalStatus == 'rejected' ? 'disabled' : '')); ?>
-              <?php echo html::a(inlink('close', "mr=$MR->id"), '<i class="icon icon-close"></i> ' . $lang->mr->close, '', "id='mergeButton' class='btn'"); ?>
+              <?php common::printIcon('mr', 'close', "mr=$MR->id", $MR, 'button', 'off', 'hiddenwin');?>
               <?php echo html::a(inlink('edit', "mr=$MR->id"), '<i class="icon icon-edit"></i> ' . str_replace($lang->mr->common, '', $lang->mr->edit), '', "id='mergeButton' class='btn'"); ?>
             <?php endif;?>
             <?php if($rawMR->state == 'closed') echo html::a(inlink('reopen', "mr=$MR->id"), '<i class="icon icon-restart"></i> ' . $lang->mr->reopen, '', "id='mergeButton' class='btn'"); ?>