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

2024-12-16 10:14:31 +09:00 · 2024-12-16 10:14:31 +09:00 · 3784ad273c
commit 3784ad273c
parent 00a0e21de6 5cf37248cc
555 changed files with 7564 additions and 3363 deletions
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@ -147,6 +147,7 @@ class InitialStateSerializer < ActiveModel::Serializer
      trends_as_landing_page: Setting.trends_as_landing_page,
      trends_enabled: Setting.trends,
      version: instance_presenter.version,
+      terms_of_service_enabled: TermsOfService.live.exists?,
    }
  end