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

Conflicts:
- package.json
  Not really a conflict, caused by an additional dependency in glitch-soc.
- yarn.lock
  Not really a conflict, caused by an additional dependency in glitch-soc.

diff --cc .env.production.sample
Simple merge

diff --cc Gemfile
index 878963fd560b4df6949f6148a730ef75a95409ab,a259bd53d00f4da0eb6d40b6a7486a6e3219f743..4d6d3aec01909458b9762674729fa9708fed934b
--- 1/Gemfile
--- 2/Gemfile
+++ b/Gemfile
@@@ -101,10 -100,8 +101,10 @@@ gem 'json-ld', git: 'https://github.com
  gem 'json-ld-preloaded', '~> 3.0'
  gem 'rdf-normalize', '~> 0.3'
  
 +gem 'redcarpet', '~> 3.4'
 +
  group :development, :test do
-   gem 'fabrication', '~> 2.20'
+   gem 'fabrication', '~> 2.21'
    gem 'fuubar', '~> 2.5'
    gem 'i18n-tasks', '~> 0.9', require: false
    gem 'pry-byebug', '~> 3.7'

diff --cc Gemfile.lock
Simple merge

diff --cc app/helpers/accounts_helper.rb
Simple merge

diff --cc app/javascript/mastodon/features/compose/components/poll_form.js
Simple merge

diff --cc app/javascript/mastodon/locales/defaultMessages.json
Simple merge

diff --cc app/javascript/mastodon/locales/en.json
Simple merge

diff --cc app/models/account.rb
Simple merge

diff --cc app/models/media_attachment.rb
Simple merge

diff --cc app/serializers/rest/account_serializer.rb
Simple merge

diff --cc config/locales/en.yml
Simple merge

diff --cc package.json
index 99a80b8ee63ec97412f135798a88249fe5a2bd46,f97dd1286675b2e54b6dae0c2d739697e24a5ac3..c00dea8b3f6b5ba4b9e85c9539dcc069a713d8e5
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -60,23 -59,19 +60,20 @@@
    },
    "private": true,
    "dependencies": {
-     "@babel/core": "^7.7.2",
-     "@babel/plugin-proposal-class-properties": "^7.7.0",
-     "@babel/plugin-proposal-decorators": "^7.7.0",
-     "@babel/plugin-proposal-object-rest-spread": "^7.6.2",
-     "@babel/plugin-syntax-dynamic-import": "^7.7.4",
+     "@babel/core": "^7.7.4",
+     "@babel/plugin-proposal-class-properties": "^7.7.4",
+     "@babel/plugin-proposal-decorators": "^7.7.4",
      "@babel/plugin-transform-react-inline-elements": "^7.7.4",
-     "@babel/plugin-transform-react-jsx-self": "^7.7.4",
-     "@babel/plugin-transform-react-jsx-source": "^7.5.0",
      "@babel/plugin-transform-runtime": "^7.7.4",
      "@babel/preset-env": "^7.7.4",
-     "@babel/preset-react": "^7.7.0",
+     "@babel/preset-react": "^7.7.4",
      "@babel/runtime": "^7.7.4",
+     "@gamestdio/websocket": "^0.3.2",
      "@clusterws/cws": "^0.16.0",
      "array-includes": "^3.0.3",
-     "arrow-key-navigation": "^1.0.2",
-     "autoprefixer": "^9.6.1",
 +    "atrament": "^0.2.3",
+     "arrow-key-navigation": "^1.1.0",
+     "autoprefixer": "^9.7.3",
      "axios": "^0.19.0",
      "babel-loader": "^8.0.6",
      "babel-plugin-lodash": "^3.3.4",

diff --cc yarn.lock
index ef42491e4efeba1b6858a58b817ab5685896e27f,ae07ea298e31ff7e0d55afda0171f7660ba50b14..54c3f140b9e496777a68ccdbc6a050aad917b964
--- 1/yarn.lock
--- 2/yarn.lock
+++ b/yarn.lock
@@@ -1781,17 -1798,13 +1798,17 @@@ atob@^2.1.1
    resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
    integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
  
- autoprefixer@^9.6.1:
-   version "9.6.1"
-   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz#51967a02d2d2300bb01866c1611ec8348d355a47"
-   integrity sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==
 +atrament@^0.2.3:
 +  version "0.2.3"
 +  resolved "https://registry.yarnpkg.com/atrament/-/atrament-0.2.3.tgz#6ccbc0daa6d3f25e5aeaeb31befeb78e86980348"
 +
+ autoprefixer@^9.7.3:
+   version "9.7.3"
+   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.3.tgz#fd42ed03f53de9beb4ca0d61fb4f7268a9bb50b4"
+   integrity sha512-8T5Y1C5Iyj6PgkPSFd0ODvK9DIleuPKUPYniNxybS47g2k2wFgLZ46lGQHlBuGKIAEV8fbCDfKCCRS1tvOgc3Q==
    dependencies:
-     browserslist "^4.6.3"
-     caniuse-lite "^1.0.30000980"
+     browserslist "^4.8.0"
+     caniuse-lite "^1.0.30001012"
      chalk "^2.4.2"
      normalize-range "^0.1.2"
      num2fraction "^1.2.2"