Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream

Conflicts:
- `.env.production.sample`:
  Upstream added a block of three environment variables, while glitch-soc
  has a different version of the file overall.
  Added upstream's changes.
- `app/helpers/application_helper.rb`:
  Upstream added a helper, while glitch-soc had extra helpers.
  Added upstream's helper.

app/javascript/mastodon/features/compose/components/poll_form.jsx

@@ -25,7 +25,7 @@ const messages = defineMessages({
   minutes: { id: 'intervals.full.minutes', defaultMessage: '{number, plural, one {# minute} other {# minutes}}' },
   hours: { id: 'intervals.full.hours', defaultMessage: '{number, plural, one {# hour} other {# hours}}' },
   days: { id: 'intervals.full.days', defaultMessage: '{number, plural, one {# day} other {# days}}' },
-  singleChoice: { id: 'compose_form.poll.single', defaultMessage: 'Pick one' },
+  singleChoice: { id: 'compose_form.poll.single', defaultMessage: 'Single choice' },
   multipleChoice: { id: 'compose_form.poll.multiple', defaultMessage: 'Multiple choice' },
 });