I'm not sure what purpose these “+” served?!

Merge upstream changes

* Never return empty participants for conversations

Fixes #10068

* Fix client-side crash when conversations have no participants

Port 4e71b104e6 to glitch-soc,
fixing a crash in the process

Fix #9895

Since the “domain” field is ignored in this case.

Merge upstream changes

Regression from #9998

Merge upstream changes

Port 041ff5fa9a to glitch-soc

Port 71e28ba399 to glitch-soc

Conflicts:
- app/serializers/rest/instance_serializer.rb
- app/views/layouts/error.html.haml
- public/oops.png
  Took our version (same as upstream but without the things that only
  make sense in an animation).

Additional changes:
- app/javascript/flavours/vanilla/theme.yml
  Include upstream's javascript in error pages.

Merge upstream changes

Regression from #9581

Fix #8785

Fix #9350

Fix #6060

Fix #9922

Port 169b9d4428 to glitch-soc

* Filter incoming Announce activities by relation to local activity

Reject if announcer is not followed by local accounts, and is not
from an enabled relay, and the object is not a local status

Follow-up to #10005

* Fix tests

Port f9a338b473 to glitch-soc

Fix #10033

Fix #9190

Bumps [better_errors](https://github.com/BetterErrors/better_errors) from 2.5.0 to 2.5.1.
- [Release notes](https://github.com/BetterErrors/better_errors/releases)
- [Changelog](https://github.com/BetterErrors/better_errors/blob/master/CHANGELOG.md)
- [Commits](https://github.com/BetterErrors/better_errors/compare/v2.5.0...v2.5.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>

fix #10045

Fix #9895

Deletions take a lot of resources to execute and cause a lot of
federation traffic, so it makes sense to decrease the number
someone can queue up through the API.

30 per 30 minutes

* Revert "Change robots.txt to exclude some URLs (#10037)"

This reverts commit 80161f4351.

* Let's block media_proxy

/media_proxy/ is a dynamic route used for requesting uncached media, so it's
probably bad to let crawlers use it

* misleading comment

* Add image descriptions to searchable post content.

* Allow multi-line image descriptions.

* Request image descriptions in the same query as posts when creating the search index.

(see https://github.com/tootsuite/mastodon/pull/10036#discussion_r256551624)

- Exclude static assets
- Exclude uploaded files
- Exclude alternate versions of the profile page
- Exclude media proxy URLs

* I18n: Update Czech pluralization

* I18n: Fix some language names

* I18n: Fix some language names

* Add list title editing

Port changes made by ash for glitch-soc

* Code style fixes