Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
  Upstream changed how icons are handled, including on a line modified by
  glitch-soc to bump the number of poll options.
  Applied upstream's change, while keeping the increased number of poll
  options.

jest.config.js

@@ -19,6 +19,9 @@ const config = {
   ],
   coverageDirectory: '<rootDir>/coverage',
   moduleDirectories: ['<rootDir>/node_modules', '<rootDir>/app/javascript'],
+  moduleNameMapper: {
+    '\\.svg$': '<rootDir>/app/javascript/__mocks__/svg.js',
+  },
 };
 
 module.exports = config;