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

2024-09-18 08:31:34 +09:00 · 2024-09-18 08:31:34 +09:00 · 4ce35dd837
commit 4ce35dd837
parent fe051aa32d 3e91c101b3
188 changed files with 1994 additions and 980 deletions
--- a/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@ -147,7 +147,6 @@ class InitialStateSerializer < ActiveModel::Serializer
      trends_as_landing_page: Setting.trends_as_landing_page,
      trends_enabled: Setting.trends,
      version: instance_presenter.version,
-      force_grouped_notifications: ENV['FORCE_GROUPED_NOTIFICATIONS'] == 'true',
    }
  end