Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-24 19:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '4dc21d7afdb485402555908bc72d071f8b25ec36' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `config/settings.yml`:
  Upstream replaced a setting with 4 new ones, while glitch-soc had modified
  the default value of that setting.
  Removed the old setting and added the new settings, but with defaults
  matching glitch-soc's previous behavior.
This commit is contained in:
Claire
2025-10-06 19:12:25 +02:00
parent d5097398fe 4dc21d7afd
commit 73a625c284
105 changed files with 692 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/serializers/initial_state_serializer.rb
View File

@@ -128,12 +128,13 @@ class InitialStateSerializer < ActiveModel::Serializer
sso_redirect: sso_redirect,
status_page_url: Setting.status_page_url,
streaming_api_base_url: Rails.configuration.x.streaming_api_base_url,
timeline_preview: Setting.timeline_preview,
title: instance_presenter.title,
trends_as_landing_page: Setting.trends_as_landing_page,
trends_enabled: Setting.trends,
version: instance_presenter.version,
terms_of_service_enabled: TermsOfService.current.present?,
local_live_feed_access: Setting.local_live_feed_access,
remote_live_feed_access: Setting.remote_live_feed_access,
}
end