Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'devops16'

Browse Source
This commit is contained in:
liyuchun
2021-12-13 12:12:37 +08:00
parent 58fb407b19 edfb34b749
commit 4ecc85aa0e
77 changed files with 2286 additions and 850 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/scm/gitlab.class.php
View File

@@ -220,7 +220,10 @@ class gitlab
$count = $count == 0 ? '' : "-n $count";
$list = $this->getCommitsByPath($path, $fromRevision, $toRevision);
foreach($list as $commit) $commit->diffs = $this->getFilesByCommit($commit->id);
foreach($list as $commit)
{
if(isset($commit->id)) $commit->diffs = $this->getFilesByCommit($commit->id);
}
return $this->parseLog($list);
}
@@ -656,6 +659,7 @@ class gitlab
{
$results = $this->fetch($api, $params);
$params->page ++;
if(!is_array($results)) $results = array();
$allResults = $allResults + $results;
if(count($results) < 100) break;
}
@@ -751,6 +755,7 @@ class gitlab
$i = 0;
foreach($logs as $commit)
{
if(!isset($commit->id)) continue;
$parsedLog = new stdclass();
$parsedLog->revision = $commit->id;
$parsedLog->committer = $commit->committer_name;