Merge remote-tracking branch 'parent/main' into upstream-20240507

2024-05-07 08:05:04 +09:00 · 2024-05-07 08:05:04 +09:00 · 89b71363ae
commit 89b71363ae
parent bab1a792a7 6167894547
70 changed files with 1739 additions and 445 deletions
--- a/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@ -65,6 +65,8 @@ class Form::AdminSettings
    hold_remote_new_accounts
    stop_fetch_activity_domains
    stop_link_preview_domains
+    app_icon
+    favicon
  ).freeze

  INTEGER_KEYS = %i(
@ -114,6 +116,8 @@ class Form::AdminSettings
  UPLOAD_KEYS = %i(
    thumbnail
    mascot
+    app_icon
+    favicon
  ).freeze

  OVERRIDEN_SETTINGS = {