Merge remote-tracking branch 'origin/pr/487'

# Conflicts: # crates/aether-data/src/lifecycle/bootstrap/postgres.rs # crates/aether-data/src/lifecycle/migrate/tests.rs # crates/aether-data/src/repository/oauth_providers/postgres.rs # crates/aether-data/src/repository/oauth_providers/sqlite.rs # frontend/src/views/admin/OAuthSettings.vue
2026-10-04 16:37:46 +08:00 · 2026-05-19 02:27:39 +08:00
parent afedd90c80 b0fc6e68ef
commit 9fc9c334c9
27 changed files with 293 additions and 204 deletions
@@ -1885,6 +1885,7 @@ impl<'a> AdminAppState<'a> {
                        oauth_provider.extra_config,
                        "extra_config",
                    )),
+                    icon_url: None,
                    is_enabled: oauth_provider.is_enabled,
                };
                invalid!(record.validate().map_err(|err| err.to_string()));