diff --git a/module/mr/model.php b/module/mr/model.php index d0750d1421..71661463d4 100644 --- a/module/mr/model.php +++ b/module/mr/model.php @@ -842,7 +842,7 @@ class mrModel extends model $host = $this->loadModel('pipeline')->getByID($hostID); if($host->type == 'gitlab') { - $url = sprintf($this->gitlab->getApiRoot($hostID), "/projects/$projectID/merge_requests/$MRID"); + $url = sprintf($this->gitlab->getApiRoot($hostID, false), "/projects/$projectID/merge_requests/$MRID"); $MR = json_decode(commonModel::http($url)); } elseif($host->type == 'gitea') diff --git a/module/repo/config/dtable.php b/module/repo/config/dtable.php index f8466eadc1..2d77e900bd 100644 --- a/module/repo/config/dtable.php +++ b/module/repo/config/dtable.php @@ -211,7 +211,7 @@ $config->repo->taskDtable->fieldList['finishedBy']['sortType'] = true; $config->repo->taskDtable->fieldList['finishedBy']['show'] = true; $config->repo->taskDtable->fieldList['finishedBy']['group'] = 4; -$config->repo->taskDtable->fieldList['assignedTo']['type'] = 'assign'; +$config->repo->taskDtable->fieldList['assignedTo']['type'] = 'user'; $config->repo->taskDtable->fieldList['assignedTo']['sortType'] = true; $config->repo->taskDtable->fieldList['assignedTo']['show'] = true; $config->repo->taskDtable->fieldList['assignedTo']['group'] = 3;