diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 85543e2091..677ea2bf27 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -691,3 +691,5 @@ $lang->action->dynamicAction->task['gitcommited'] = 'Git Commit'; $lang->action->dynamicAction->bug['repocreated'] = $lang->action->label->repocreated; $lang->action->desc->createmr = '$extra'; $lang->action->desc->mergedmr = '$date, $actor merged code.'; +$lang->action->desc->approve = '$date, $actor approved.'; +$lang->action->desc->reject = '$date, $actor rejected.'; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 77e4549431..46c0d3a016 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -693,3 +693,5 @@ $lang->action->dynamicAction->task['gitcommited'] = 'git提交'; $lang->action->dynamicAction->bug['repocreated'] = '创建代码评审'; $lang->action->desc->createmr = '$extra'; $lang->action->desc->mergedmr = '$date, 由 $actor 合并了 代码。'; +$lang->action->desc->approve = '$date, 由 $actor 审核通过。'; +$lang->action->desc->reject = '$date, 由 $actor 拒绝。'; diff --git a/module/gitlab/model.php b/module/gitlab/model.php index b14c7615a3..3547adfeb5 100644 --- a/module/gitlab/model.php +++ b/module/gitlab/model.php @@ -2168,6 +2168,8 @@ class gitlabModel extends model { $this->loadModel('action')->create('gitlabuser', $reponse->id, 'edited', '', $reponse->name); + /* Delete old bind. */ + $this->dao->delete()->from(TABLE_OAUTH)->where('providerType')->eq('gitlab')->andWhere('providerID')->eq($gitlabID)->andWhere('openID')->eq($reponse->id)->andWhere('account')->ne($user->account)->exec(); /* Bind user. */ if($user->account && $changeBind) { diff --git a/module/mr/lang/en.php b/module/mr/lang/en.php index 9e3b18a03b..224a750b11 100644 --- a/module/mr/lang/en.php +++ b/module/mr/lang/en.php @@ -14,14 +14,14 @@ $lang->mr->target = 'target'; $lang->mr->viewDiff = 'View diff'; $lang->mr->diff = 'View diff'; $lang->mr->viewInGitlab = 'View in GitLab'; -$lang->mr->link = 'Link of stories,bugs,tasks'; +$lang->mr->link = 'Link of stories,Bugs,tasks'; $lang->mr->createAction = '%s, %s submitted a Merge Request.'; -$lang->mr->linkList = 'Link List of stories,bugs,tasks'; +$lang->mr->linkList = 'Link List of stories,Bugs,tasks'; $lang->mr->linkStory = 'Link Stories'; $lang->mr->linkBug = 'Link Bugs'; $lang->mr->linkTask = 'Link Tasks'; -$lang->mr->unlink = 'UnLink of stories,bugs,tasks'; +$lang->mr->unlink = 'UnLink of stories,Bugs,tasks'; $lang->mr->addBug = 'Add Review'; $lang->mr->id = 'ID'; diff --git a/module/mr/lang/zh-cn.php b/module/mr/lang/zh-cn.php index d39c5e7b9e..c5b77246d7 100644 --- a/module/mr/lang/zh-cn.php +++ b/module/mr/lang/zh-cn.php @@ -14,14 +14,14 @@ $lang->mr->target = '目标项目分支'; $lang->mr->viewDiff = '比对代码'; $lang->mr->diff = '比对代码'; $lang->mr->viewInGitlab = '在GitLab查看'; -$lang->mr->link = '关联需求、bug、任务'; +$lang->mr->link = '关联需求、Bug、任务'; $lang->mr->createAction = '%s, 由 %s 提交了 合并请求。'; -$lang->mr->linkList = '浏览关联需求、bug、任务'; +$lang->mr->linkList = '浏览关联需求、Bug、任务'; $lang->mr->linkStory = '关联需求'; $lang->mr->linkBug = '关联Bug'; $lang->mr->linkTask = '关联任务'; -$lang->mr->unlink = '取消关联需求、bug、任务'; +$lang->mr->unlink = '取消关联需求、Bug、任务'; $lang->mr->addBug = '添加评审'; $lang->mr->id = 'ID'; diff --git a/module/mr/view/view.html.php b/module/mr/view/view.html.php index 1093854007..c5c6367573 100644 --- a/module/mr/view/view.html.php +++ b/module/mr/view/view.html.php @@ -141,7 +141,7 @@