Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `.github/ISSUE_TEMPLATE/bug_report.md`:
  Upstream added the `bug` label to bug reports.
  Did the same.
- `app/services/fan_out_on_write_service.rb`:
  Upstream put DMs back into timelines, glitch-soc was already doing it.
  Ignored upstream changes.

diff --cc .github/ISSUE_TEMPLATE/bug_report.md
index ceb737075b1a5b6b28a5e5e76ea5cdf9046e0e1b,8ae4bb8825335b58f70dc7a45e3e1587deb7c95e..870394a9156ef286d018c91b3b784121a84338e4
--- 1/.github/ISSUE_TEMPLATE/bug_report.md
--- 2/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@@ -1,12 -1,27 +1,12 @@@
  ---
  name: Bug Report
- about: Create a report to help us improve
- 
+ about: If something isn't working as expected
+ labels: bug
  ---
  
 -<!-- Make sure that you are submitting a new bug that was not previously reported or already fixed -->
 +[Issue text goes here].
  
 -<!-- Please use a concise and distinct title for the issue -->
 +* * * *
  
 -### Expected behaviour
 -
 -<!-- What should have happened? -->
 -
 -### Actual behaviour
 -
 -<!-- What happened? -->
 -
 -### Steps to reproduce the problem
 -
 -<!-- What were you trying to do? -->
 -
 -### Specifications
 -
 -<!-- What version or commit hash of Mastodon did you find this bug in? -->
 -
 -<!-- If a front-end issue, what browser and operating systems were you using? -->
 +- [ ] I searched or browsed the repo’s other issues to ensure this is not a duplicate.
 +- [ ] This bugs also occur on vanilla Mastodon

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc config/routes.rb
Simple merge

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge