Merge branch 'devops22_liyuchun' into 'master'

* Fix bug #19853.

See merge request easycorp/zentaopms!1885
This commit is contained in:
孙广明
2022-02-22 07:54:03 +00:00
2 changed files with 2 additions and 1 deletions
+1 -1
View File
@@ -646,7 +646,7 @@ class gitlab
$param = new stdclass();
$param->path = urldecode($path);
$param->ref_name = $this->branch;
$param->ref_name = $fromRevision ? $fromRevision : $this->branch;
$fromDate = $this->getCommittedDate($fromRevision);
$toDate = $this->getCommittedDate($toRevision);
+1
View File
@@ -574,6 +574,7 @@ class repo extends control
$this->scm->setEngine($repo);
$log = $this->scm->log('', $revision, $revision);
$log[0]->comment = $this->repo->replaceCommentLink($log[0]->comment);
$log[0]->commit = '';
$history = $this->dao->select('*')->from(TABLE_REPOHISTORY)->where('revision')->eq($log[0]->revision)->andWhere('repo')->eq($repoID)->fetch();
if($history)