Merge remote-tracking branch 'origin/release-20.0'

This commit is contained in:
tianshujie
2024-04-23 17:12:24 +08:00
191 changed files with 1353 additions and 866 deletions
+2 -2
View File
@@ -199,9 +199,9 @@ class gitModel extends model
{
$scm = strtolower($repo->SCM);
$userList = $this->loadModel($scm)->apiGetUsers((int)$repo->serviceHost);
$acountIDPairs = $this->loadModel('pipeline')->getUserBindedPairs((int)$repo->serviceHost, $scm, 'openID,account');
$accountIDPairs = $this->loadModel('pipeline')->getUserBindedPairs((int)$repo->serviceHost, $scm, 'openID,account');
foreach($userList as $user) $accountPairs[$user->realname] = zget($acountIDPairs, $user->id, '');
foreach($userList as $user) $accountPairs[$user->realname] = zget($accountIDPairs, $user->id, '');
}
/* Update code commit history. */