diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-06-30 01:01:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-30 01:01:43 +0200 |
| commit | a4c828f8e73672ee344ab234ef11b173d44e1fdb (patch) | |
| tree | a5ff457e1cc681b82a95801314dac6c316d2f5b6 /app/serializers | |
| parent | ff3626269eae9c2d15af4c7f05427c2bfcb065ef (diff) | |
| parent | ba8f4535e3abfbd2f4dac95572877d976b65f0dd (diff) | |
Merge pull request #1558 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/initial_state_serializer.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb index 470cec8a1..a05164641 100644 --- a/app/serializers/initial_state_serializer.rb +++ b/app/serializers/initial_state_serializer.rb @@ -33,6 +33,7 @@ class InitialStateSerializer < ActiveModel::Serializer source_url: Mastodon::Version.source_url, version: Mastodon::Version.to_s, invites_enabled: Setting.min_invite_role == 'user', + limited_federation_mode: Rails.configuration.x.whitelist_mode, mascot: instance_presenter.mascot&.file&.url, profile_directory: Setting.profile_directory, trends: Setting.trends, |