diff --git a/lib/scm/gitlab.class.php b/lib/scm/gitlab.class.php index a5c472ed06..b5f8e5c696 100644 --- a/lib/scm/gitlab.class.php +++ b/lib/scm/gitlab.class.php @@ -523,7 +523,6 @@ class gitlab if(!scm::checkRevision($version)) return array(); $api = "commits"; - /* TODO Put getCommits into cron job. And check best size of $count. */ if(empty($count)) $count = 10; $params = array(); diff --git a/module/bug/model.php b/module/bug/model.php index 4cef62c809..ee0a994d51 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -285,7 +285,7 @@ class bugModel extends model public function createBugFromGitlabIssue($bug, $executionID) { $bug->openedBy = $this->app->user->account; - $bug->openedDate = helper::now(); // TODO(dingguodong) use from issue->created_at ? + $bug->openedDate = helper::now(); $bug->assignedDate = isset($bug->assignedTo) ? helper::now() : 0; $bug->openedBuild = 'trunk'; $bug->story = 0; @@ -1817,7 +1817,7 @@ class bugModel extends model $bugSteps .= $this->lang->bug->tplResult; $bugSteps .= $this->lang->bug->tplExpect; } - + if(!empty($run->task)) $testtask = $this->loadModel('testtask')->getById($run->task); $executionID = isset($testtask->execution) ? $testtask->execution : 0; diff --git a/module/gitlab/model.php b/module/gitlab/model.php index e80bbf41e2..1d3b31d592 100644 --- a/module/gitlab/model.php +++ b/module/gitlab/model.php @@ -623,7 +623,6 @@ class gitlabModel extends model */ public function apiGetIssues($gitlabID, $projectID, $options = null) { - /* TODO(dingguodong) not pagination yet. */ if($options) { $url = sprintf($this->getApiRoot($gitlabID), "/projects/{$projectID}/issues") . '&per_page=20' . $options;