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.

diff --cc app/javascript/mastodon/initial_state.js
index 89b59051c694f8bc19ac8146eaab1eb055e8bd76,1389a3c3dff2bbb7423ce4d96f80653233813dd9..1307bf23edbd476f1a4c6e2da9912187dd1109cb
--- 1/app/javascript/mastodon/initial_state.js
--- 2/app/javascript/mastodon/initial_state.js
+++ b/app/javascript/mastodon/initial_state.js
@@@ -12,8 -12,8 +12,9 @@@ export const boostModal = getMeta('boos
  export const deleteModal = getMeta('delete_modal');
  export const me = getMeta('me');
  export const searchEnabled = getMeta('search_enabled');
 +export const maxChars = (initialState && initialState.max_toot_chars) || 500;
  export const invitesEnabled = getMeta('invites_enabled');
+ export const limitedFederationMode = getMeta('limited_federation_mode');
  export const repository = getMeta('repository');
  export const source_url = getMeta('source_url');
  export const version = getMeta('version');

diff --cc app/serializers/initial_state_serializer.rb
Simple merge

diff --cc app/views/layouts/public.html.haml
Simple merge