diff --git a/module/git/model.php b/module/git/model.php index f7e7bd8a4a..586cbf066f 100644 --- a/module/git/model.php +++ b/module/git/model.php @@ -134,7 +134,7 @@ class gitModel extends model if(strpos($log->msg, $comment) !== false) $this->compile->createByIntegration($integration->id); } } - $version = $this->repo->saveOneCommit($repoID, $log, $version); + $version = $this->repo->saveOneCommit($repoID, $log, $version, $branch); $commits += count($logs); } } diff --git a/module/repo/model.php b/module/repo/model.php index 3c8935b2d5..51e9851d50 100644 --- a/module/repo/model.php +++ b/module/repo/model.php @@ -1236,7 +1236,7 @@ class repoModel extends model $action->actor = $log->author; $action->date = $log->date; - $action->comment = htmlspecialchars($this->repo->iconvComment($log->msg, $encodings)); + $action->comment = htmlspecialchars($this->iconvComment($log->msg, $encodings)); $action->extra = $scm == 'svn' ? $log->revision : substr($log->revision, 0, 10); $this->loadModel('action');