diff --git a/module/gitlab/css/managegroupmembers.css b/module/gitlab/css/managegroupmembers.css
new file mode 100644
index 0000000000..0d940091ae
--- /dev/null
+++ b/module/gitlab/css/managegroupmembers.css
@@ -0,0 +1 @@
+.table-form {min-width: 600px;}
diff --git a/module/gitlab/css/manageprojectmembers.css b/module/gitlab/css/manageprojectmembers.css
new file mode 100644
index 0000000000..0d940091ae
--- /dev/null
+++ b/module/gitlab/css/manageprojectmembers.css
@@ -0,0 +1 @@
+.table-form {min-width: 600px;}
diff --git a/module/mr/control.php b/module/mr/control.php
index 9e484e791d..aba3903a58 100644
--- a/module/mr/control.php
+++ b/module/mr/control.php
@@ -402,8 +402,7 @@ class mr extends control
$MR = $this->mr->getByID($MRID);
$result = $this->mr->close($MR);
- if($result['result'] == 'fali') return $this->send($result);
- die(js::locate($result['locate'], 'parent'));
+ return $this->send($result);
}
/**
diff --git a/module/mr/js/view.js b/module/mr/js/view.js
index f75fc67687..a6433ab5d2 100644
--- a/module/mr/js/view.js
+++ b/module/mr/js/view.js
@@ -1,6 +1,6 @@
$(document).ready(function()
{
- $('#mergeButton').click(function()
+ $('#mergeButton,.mergeButton').click(function()
{
link = $(this).attr('href');
$.getJSON(link, function(response)
diff --git a/module/mr/view/view.html.php b/module/mr/view/view.html.php
index 7b1b1f5a3e..62b842c95e 100644
--- a/module/mr/view/view.html.php
+++ b/module/mr/view/view.html.php
@@ -111,7 +111,7 @@
id&action=approve", '', true), ' ' . $lang->mr->approve, '', "id='mergeButton' class='btn iframe showinonlybody'"); ?>
id&action=reject", '', true), ' ' . $lang->mr->reject, '', "id='mergeButton' class='btn iframe showinonlybody'" . ($MR->approvalStatus == 'rejected' ? 'disabled' : '')); ?>
- id", $MR, 'button', 'off', 'hiddenwin');?>
+ id"), ' ' . $lang->mr->close, '', "class='btn mergeButton'"); ?>
id"), ' ' . str_replace($lang->mr->common, '', $lang->mr->edit), '', "id='mergeButton' class='btn'"); ?>
state == 'closed') echo html::a(inlink('reopen', "mr=$MR->id"), ' ' . $lang->mr->reopen, '', "id='mergeButton' class='btn'"); ?>