From: Thibaut Girka <thib@sitedethib.com>
Date: Fri, 20 Nov 2020 12:27:48 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=48f0f3ffeeb2b3dfb8af7d4d0fba3b64697d125c;p=mastodon.git

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.
---

48f0f3ffeeb2b3dfb8af7d4d0fba3b64697d125c
diff --cc .github/ISSUE_TEMPLATE/bug_report.md
index ceb737075,8ae4bb882..870394a91
--- a/.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