* Finish task#50685,50680,50672
This commit is contained in:
@@ -344,6 +344,7 @@ $lang->action->label->importedrelease = 'imported';
|
||||
$lang->action->label->importedexecution = 'imported';
|
||||
$lang->action->label->importedbuild = 'imported';
|
||||
$lang->action->label->fromsonarqube = 'created a bug from SonarQube Issue named:';
|
||||
$lang->action->label->binduser = 'bind user';
|
||||
|
||||
/* Dynamic information is grouped by object. */
|
||||
$lang->action->dynamicAction = new stdclass;
|
||||
@@ -823,3 +824,4 @@ $lang->action->desc->deletemr = '$date, <strong>$actor</stro
|
||||
$lang->action->desc->mergedmr = '$date, <strong>$actor</strong> merged <a href="$extra">code</a>.';
|
||||
$lang->action->desc->approve = '$date, <strong>$actor</strong> approved.';
|
||||
$lang->action->desc->reject = '$date, <strong>$actor</strong> rejected.';
|
||||
$lang->action->desc->binduser = '$date, <strong>$actor</strong> modified bound user.';
|
||||
|
||||
@@ -344,6 +344,7 @@ $lang->action->label->importedrelease = '导入了';
|
||||
$lang->action->label->importedexecution = '导入了';
|
||||
$lang->action->label->importedbuild = '导入了';
|
||||
$lang->action->label->fromsonarqube = '由SonarQube问题创建';
|
||||
$lang->action->label->binduser = '绑定用户了';
|
||||
|
||||
/* 动态信息按照对象分组 */
|
||||
$lang->action->dynamicAction = new stdclass();
|
||||
@@ -823,3 +824,4 @@ $lang->action->desc->deletemr = '$date, 由 <strong>$actor</
|
||||
$lang->action->desc->mergedmr = '$date, 由 <strong>$actor</strong> 合并了 <a href="$extra">代码</a>。';
|
||||
$lang->action->desc->approve = '$date, 由 <strong>$actor</strong> 审核通过。';
|
||||
$lang->action->desc->reject = '$date, 由 <strong>$actor</strong> 拒绝。';
|
||||
$lang->action->desc->binduser = '$date, 由 <strong>$actor</strong> 修改了绑定用户。';
|
||||
|
||||
@@ -185,6 +185,7 @@ class gitlab extends control
|
||||
|
||||
$this->dao->insert(TABLE_OAUTH)->data($user)->exec();
|
||||
}
|
||||
$this->loadModel('action')->create('gitlab', $gitlabID, 'binduser');
|
||||
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->server->http_referer));
|
||||
}
|
||||
|
||||
|
||||
@@ -184,7 +184,6 @@ class mrModel extends model
|
||||
$this->dao->insert(TABLE_MR)->data($MR, $this->config->mr->create->skippedFields)
|
||||
->batchCheck($this->config->mr->create->requiredFields, 'notempty')
|
||||
->checkIF($MR->needCI, 'jobID', 'notempty')
|
||||
->autoCheck()
|
||||
->exec();
|
||||
if(dao::isError()) return array('result' => 'fail', 'message' => dao::getError());
|
||||
|
||||
|
||||
@@ -1372,7 +1372,7 @@ class repoModel extends model
|
||||
{
|
||||
$tasks[$id] = $id;
|
||||
$actions['task'][$id]['start']['consumed'] = $matches[11][$i];
|
||||
$actions['task'][$id]['start']['left'] = $matches[16][$i];
|
||||
$actions['task'][$id]['start']['left'] = $matches[17][$i];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user