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

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
 

app/serializers/rest/instance_serializer.rb

@@ -133,10 +133,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
   end
 
   def api_versions
-    {
-      mastodon: 1,
-      kmyblue: KMYBLUE_API_VERSION,
-    }
+    Mastodon::Version.api_versions
   end
 
   private