diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-06-30 00:42:52 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-06-30 00:42:52 +0200 |
| commit | d1780fb9a4dbf3f458f9634b285294c0d674feb9 (patch) | |
| tree | 56a3e393cae7583d0d790227d6dbd4a528021e15 /app/serializers | |
| parent | ff3626269eae9c2d15af4c7f05427c2bfcb065ef (diff) | |
| parent | 7c27ccb8d8fda060f3c5b234f7c81fc29b5fc915 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/ISSUE_TEMPLATE/bug_report.md`: Removed upstream, while we had a checkbox telling people to check if the issue was present upstream. Removed the file as well.
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, |