Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-05 22:38:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch '1.8.x' into fix-duplicate-document-error

Browse source
This commit is contained in:
Damodar Lohani 2025-12-03 05:17:24 +05:45 committed by GitHub
commit 97038c9d05
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/dbip/dbip-country-lite-2024-09.mmdb
View file

Binary file not shown.

BIN
app/assets/dbip/dbip-country-lite-2025-12.mmdb Normal file
View file

Binary file not shown.

3
app/controllers/api/vcs.php
View file

@ -1796,7 +1796,8 @@ App::patch('/v1/vcs/github/installations/:installationId/repositories/:repositor
throw new Exception(Exception::INSTALLATION_NOT_FOUND);
}
$repository = Authorization::skip(fn () => $dbForPlatform->getDocument('repositories', $repositoryId, [
$repository = Authorization::skip(fn () => $dbForPlatform->findOne('repositories', [
Query::equal('$id', [$repositoryId]),
Query::equal('projectInternalId', [$project->getSequence()])
]));

2
app/init/registers.php
View file

@ -372,7 +372,7 @@ $register->set('smtp', function () {
return $mail;
});
$register->set('geodb', function () {
return new Reader(__DIR__ . '/../assets/dbip/dbip-country-lite-2024-09.mmdb');
return new Reader(__DIR__ . '/../assets/dbip/dbip-country-lite-2025-12.mmdb');
});
$register->set('passwordsDictionary', function () {
$content = \file_get_contents(__DIR__ . '/../assets/security/10k-common-passwords');

2
tests/e2e/Services/Account/AccountBase.php
View file

@ -55,7 +55,7 @@ trait AccountBase
'origin' => 'http://localhost',
'content-type' => 'application/json',
'x-appwrite-project' => 'console',
'x-forwarded-for' => '103.152.127.250' // Test IP for denied access region
'x-forwarded-for' => '31.6.14.220' // Test IP for denied access region
]), [
'userId' => ID::unique(),
'email' => $email,