diff options
| author | かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com> | 2026-03-05 19:24:30 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-05 19:24:30 +0900 |
| commit | 3980b2ca55cdf6a694ef8cad911e161672c0444f (patch) | |
| tree | 859c1a97202813247a0b59b43c8152e578eef8e9 /packages/backend/src/server/api/endpoints/admin | |
| parent | New Crowdin updates (#17097) (diff) | |
| download | misskey-3980b2ca55cdf6a694ef8cad911e161672c0444f.tar.gz misskey-3980b2ca55cdf6a694ef8cad911e161672c0444f.tar.bz2 misskey-3980b2ca55cdf6a694ef8cad911e161672c0444f.zip | |
fix: review fixes (#17208)
* fix: OAuthのContent-Typeを正しく判定するように
* fix(frontend): fix outdated comments
* fix: storagePersistenceのtop-level awaitを解消
* fix
* fix(frontend): add comment
Co-Authored-By: anatawa12 <anatawa12@icloud.com>
* fix
* fix: rename `users/get-following-users-by-birthday`
* fix: fix types
* Update MkForm.vue
* refactor utility/storage.ts
---------
Co-authored-by: anatawa12 <anatawa12@icloud.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Diffstat (limited to 'packages/backend/src/server/api/endpoints/admin')
| -rw-r--r-- | packages/backend/src/server/api/endpoints/admin/update-meta.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/backend/src/server/api/endpoints/admin/update-meta.ts b/packages/backend/src/server/api/endpoints/admin/update-meta.ts index 7a8dfc4555..372fe3a25f 100644 --- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts +++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts @@ -341,7 +341,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint- if (ps.clientOptions !== undefined) { set.clientOptions = { - ...serverSettings.clientOptions, + ...this.serverSettings.clientOptions, ...ps.clientOptions, }; } |