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

Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock

Bump offline-plugin from 5.0.6 to 5.0.7 (#10937)

Bumps [offline-plugin](https://github.com/NekR/offline-plugin) from 5.0.6 to 5.0.7.
- [Release notes](https://github.com/NekR/offline-plugin/releases)
- [Changelog](https://github.com/NekR/offline-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/NekR/offline-plugin/compare/v5.0.6...v5.0.7)

Bump babel-jest from 24.5.0 to 24.8.0 (#10938)

Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest) from 24.5.0 to 24.8.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v24.8.0/packages/babel-jest)

Revert "Bump react-redux-loading-bar from 4.0.8 to 4.2.0 (#10897)" (#10927)

This reverts commit 9ab053a4b47f971192be1e4215eaf0b2fa2f69b7.

Fix NotifyService test with regards to reblogs (#10928)

Fixes #10890

Fix profile picture preview (#10931)

Added various vars to env sample

Added several vars that are already implemented to the .env.production.sample file.
-Max bio character limit
-Number of profile fields allowed
-Max display name character limit

Fixed the very wrong byte to megabyte conversion

Correctly documented max image and video vars

Added MAX_IMAGE_SIZE and MAX_VIDEO_SIZE and documented their usage.

Added env variables for max image and video size.

I changed the IMAGE_LIMIT and VIDEO_LIMIT variables to read from the env, or use default if not set in the env, to make it easier to change this on an instance by instance basis and make it persistent across updates.

Fix expanding status from menu modal in glitch-soc

Fixes #1085

Improvement variable height in single column layout (#10917)

* Improvement variable height of compose and navigation panel in single column layout

* Fix wrong quotes and missing commas

Bump eslint-plugin-jsx-a11y from 6.1.2 to 6.2.1 (#10923)

Bumps [eslint-plugin-jsx-a11y](https://github.com/evcohen/eslint-plugin-jsx-a11y) from 6.1.2 to 6.2.1.
- [Release notes](https://github.com/evcohen/eslint-plugin-jsx-a11y/releases)
- [Changelog](https://github.com/evcohen/eslint-plugin-jsx-a11y/blob/master/CHANGELOG.md)
- [Commits](https://github.com/evcohen/eslint-plugin-jsx-a11y/compare/v6.1.2...v6.2.1)

Bump jest from 24.5.0 to 24.8.0 (#10925)

Bumps [jest](https://github.com/facebook/jest) from 24.5.0 to 24.8.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v24.5.0...v24.8.0)

Bump webpack-dev-server from 3.2.1 to 3.5.1 (#10924)

Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 3.2.1 to 3.5.1.
- [Release notes](https://github.com/webpack/webpack-dev-server/releases)
- [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-server/compare/v3.2.1...v3.5.1)

Bump eslint-plugin-promise from 4.0.1 to 4.1.1 (#10921)

Bumps [eslint-plugin-promise](https://github.com/xjamundx/eslint-plugin-promise) from 4.0.1 to 4.1.1.
- [Release notes](https://github.com/xjamundx/eslint-plugin-promise/releases)
- [Changelog](https://github.com/xjamundx/eslint-plugin-promise/blob/master/CHANGELOG.md)
- [Commits](https://github.com/xjamundx/eslint-plugin-promise/commits)

Remove dependency on history (#10912)

Center 2-columns layout without side effect (#10915)

Small update for sk.yml (#10913)

Bump autoprefixer from 9.4.10 to 9.5.1 (#10910)

Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 9.4.10 to 9.5.1.
- [Release notes](https://github.com/postcss/autoprefixer/releases)
- [Changelog](https://github.com/postcss/autoprefixer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/postcss/autoprefixer/compare/9.4.10...9.5.1)

Bump rails-ujs from 5.2.2 to 5.2.3 (#10907)

Bumps [rails-ujs](https://github.com/rails/rails) from 5.2.2 to 5.2.3.
- [Release notes](https://github.com/rails/rails/releases)
- [Commits](https://github.com/rails/rails/compare/v5.2.2...v5.2.3)

Bump sass from 1.17.2 to 1.20.1 (#10908)

Bumps [sass](https://github.com/sass/dart-sass) from 1.17.2 to 1.20.1.
- [Release notes](https://github.com/sass/dart-sass/releases)
- [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/dart-sass/compare/1.17.2...1.20.1)

[Security] Bump axios from 0.18.0 to 0.19.0 (#10906)

Bumps [axios](https://github.com/axios/axios) from 0.18.0 to 0.19.0. **This update includes security fixes.**
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.18.0...v0.19.0)

Bump webpacker from 4.0.5 to 4.0.6 (#10905)

Bumps [webpacker](https://github.com/rails/webpacker) from 4.0.5 to 4.0.6.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v4.0.5...v4.0.6)

Bump dotenv from 6.2.0 to 8.0.0 (#10888)

Bumps [dotenv](https://github.com/motdotla/dotenv) from 6.2.0 to 8.0.0.
- [Release notes](https://github.com/motdotla/dotenv/releases)
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
- [Commits](https://github.com/motdotla/dotenv/compare/v6.2.0...v8.0.0)

Bump webpacker from 4.0.4 to 4.0.5 (#10903)

Bumps [webpacker](https://github.com/rails/webpacker) from 4.0.4 to 4.0.5.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v4.0.4...v4.0.5)

Fix old migrations failing because of new version of `strong_migrations` (#10904)

Fix old migrations failing because of new version of `strong_migrations`

Remove dependency on fibers (#10902)

Bump webpack-cli from 3.2.3 to 3.3.2 (#10896)

Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.2.3 to 3.3.2.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/V.3.2.3...v3.3.2)

Bump redis from 4.1.1 to 4.1.2 (#10899)

Bumps [redis](https://github.com/redis/redis-rb) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/redis/redis-rb/releases)
- [Changelog](https://github.com/redis/redis-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/redis/redis-rb/compare/v4.1.1...v4.1.2)

Bump rubocop from 0.70.0 to 0.71.0 (#10901)

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.70.0 to 0.71.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.70.0...v0.71.0)

Bump react-redux-loading-bar from 4.0.8 to 4.2.0 (#10897)

Bumps [react-redux-loading-bar](https://github.com/mironov/react-redux-loading-bar) from 4.0.8 to 4.2.0.
- [Release notes](https://github.com/mironov/react-redux-loading-bar/releases)
- [Changelog](https://github.com/mironov/react-redux-loading-bar/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mironov/react-redux-loading-bar/commits)

Merge pull request #1076 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

Bump react-select from 2.2.0 to 2.4.4 (#10895)

Bumps [react-select](https://github.com/JedWatson/react-select) from 2.2.0 to 2.4.4.
- [Release notes](https://github.com/JedWatson/react-select/releases)
- [Changelog](https://github.com/JedWatson/react-select/blob/master/.sweet-changelogs.js)
- [Commits](https://github.com/JedWatson/react-select/compare/v2.2.0...v2.4.4)

Bump object.values from 1.0.4 to 1.1.0 (#10894)

Bumps [object.values](https://github.com/es-shims/Object.values) from 1.0.4 to 1.1.0.
- [Release notes](https://github.com/es-shims/Object.values/releases)
- [Changelog](https://github.com/es-shims/Object.values/blob/master/CHANGELOG.md)
- [Commits](https://github.com/es-shims/Object.values/compare/v1.0.4...v1.1.0)

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

Change default to single column UI (#10847)

Keep current setting for users who were active within the last month

Raise exception when attempting to serialize local-only statuses

Fix incorrect PropType in Glitch AutosuggestInput

Remove isRequired from Glitch ReplyIndicator status

This can be null under normal circumstances, which isRequired doesn't
like.

Bump aws-sdk-s3 from 1.40.0 to 1.41.0 (#10892)

Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.40.0 to 1.41.0.
- [Release notes](https://github.com/aws/aws-sdk-ruby/releases)
- [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md)
- [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.40.0...v1.41.0)

Bump capybara from 3.21.0 to 3.22.0 (#10893)

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.21.0 to 3.22.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.21.0...3.22.0)

Change links in right panel to open in the same tab (#10848)

For Rambox compatibility

Fix React warning about legacy lifecycle calls and sensitive status resetting (#10872)

Bump js-yaml from 3.12.0 to 3.13.1 (#10881)

Bumps [js-yaml](https://github.com/nodeca/js-yaml) from 3.12.0 to 3.13.1.
- [Release notes](https://github.com/nodeca/js-yaml/releases)
- [Changelog](https://github.com/nodeca/js-yaml/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nodeca/js-yaml/compare/3.12.0...3.13.1)

Bump express from 4.16.4 to 4.17.1 (#10889)

Bumps [express](https://github.com/expressjs/express) from 4.16.4 to 4.17.1.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.16.4...4.17.1)

Bump intl-relativeformat from 2.1.0 to 2.2.0 (#10887)

Bumps [intl-relativeformat](https://github.com/yahoo/intl-relativeformat) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/yahoo/intl-relativeformat/releases)
- [Commits](https://github.com/yahoo/intl-relativeformat/commits)

Bump babel-plugin-react-intl from 3.0.1 to 3.1.0 (#10877)

Bumps [babel-plugin-react-intl](https://github.com/formatjs/babel-plugin-react-intl) from 3.0.1 to 3.1.0.
- [Release notes](https://github.com/formatjs/babel-plugin-react-intl/releases)
- [Commits](https://github.com/formatjs/babel-plugin-react-intl/commits)

Bump strong_migrations from 0.3.1 to 0.4.0 (#10871)

Bumps [strong_migrations](https://github.com/ankane/strong_migrations) from 0.3.1 to 0.4.0.
- [Release notes](https://github.com/ankane/strong_migrations/releases)
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.3.1...v0.4.0)

Bump react-redux from 6.0.0 to 6.0.1 (#10879)

Bumps [react-redux](https://github.com/reduxjs/react-redux) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/reduxjs/react-redux/releases)
- [Changelog](https://github.com/reduxjs/react-redux/blob/master/CHANGELOG.md)
- [Commits](https://github.com/reduxjs/react-redux/compare/v6.0.0...v6.0.1)

Bump @babel/plugin-transform-runtime from 7.3.4 to 7.4.4 (#10878)

Bumps [@babel/plugin-transform-runtime](https://github.com/babel/babel) from 7.3.4 to 7.4.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.3.4...v7.4.4)

Bump webpacker from 4.0.2 to 4.0.4 (#10882)

Bumps [webpacker](https://github.com/rails/webpacker) from 4.0.2 to 4.0.4.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v4.0.2...v4.0.4)

Bump rimraf from 2.6.2 to 2.6.3 (#10880)

Bumps [rimraf](https://github.com/isaacs/rimraf) from 2.6.2 to 2.6.3.
- [Release notes](https://github.com/isaacs/rimraf/releases)
- [Commits](https://github.com/isaacs/rimraf/compare/v2.6.2...v2.6.3)

Fix safari post field display issue in single column layout (#10883)

i18n: Update Corsican front-end translation (#10884)

Add Dependabot config (#10876)

Bump capybara from 3.20.2 to 3.21.0 (#10854)

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.20.2 to 3.21.0.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.20.2...3.21.0)

Bump tty-prompt from 0.18.1 to 0.19.0 (#10870)

Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt) from 0.18.1 to 0.19.0.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases)
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.18.1...v0.19.0)

Update Japanese translations. (#10875)

run yarn manage:translations ja && i18n-tasks add-missing ja

I18n: Update Czech translation (#10874)

Truncate long URLs while providing alt text for inline images

Translate incoming remote img tags by a link

Merge pull request #1073 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

[Glitch] Use `<use />` to render transparent SVG logo instead of inserting it

Port SCSS changes from 8d5dcc9301c422f131167574da550f8cdaedb73f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>

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

Fix undefined method error (#10868)

Bump ox from 2.10.0 to 2.10.1 (#10869)

Bumps [ox](https://github.com/ohler55/ox) from 2.10.0 to 2.10.1.
- [Release notes](https://github.com/ohler55/ox/releases)
- [Changelog](https://github.com/ohler55/ox/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ohler55/ox/compare/v2.10.0...v2.10.1)

Fix undefined method error. (#10867)

Update simple_form.co.yml (#10862)

Fix web push notifications for polls (#10864)

Fixes #10861

Refactor footers in web UI into a single component (#10846)

Improve rate limiting (#10860)

* Rate limit based on remote address IP, not on potential reverse proxy

* Limit rate of unauthenticated API requests further

* Rate-limit paging requests to one every 3 seconds

Display notifications count on a new single column (#10859)

Merge pull request #1072 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

Fix video player regressions introduced by blurhash merge

[Glitch] Add keyboard shortcut to hide/show media

Port a472190729782f31731674c626c07af483fe9c7f and 988342a56cb58da9ac660eec3e55c3bcbbd6269b to glitch-soc

Use `<use />` to render transparent SVG logo instead of inserting it (#10845)

Fix poll visibility on public pages (#10817)

* Fix poll visibility on public pages

* Revert "Fix poll visibility on public pages"

This reverts commit 54a9608add6f855bc6337fe3c65eaee7ba13db49.

* Revert "Change poll options to alphabetic letters when status text is hidden"

This reverts commit c53d67326201b2061990b1874a3547c3647f50d2.

Docker: Remove dist-upgrade (#10822)

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

Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb

Conflicts due to the addition of a new preference upstream,
“advanced layout”.

[Glitch] Fix composer route opening when not needed

Port c1e77b56a92fc075f000af9c263c72ba6bdbe5f7 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>

Create new click handler for status__expand area in status (#10837)

This click handler only activates on left-click, resolving #10798.
This matches behavior in status_content.js, as added in #536

Fix null error in status component when determining showMedia state (#10838)

* Fix null error in status component when determining showMedia state

Also update the showMedia value if the status passed to the
component changes

* Refactor media visibility computation into a defaultMediaVisibility function

* Fix default media visibility with reblogs

Update simple_form.sk.yml (#10842)

Fix wrong redirect from getting started to home in advanced Web UI  (#10839)

* update Ruby to 2.5.3

* Link to Getting Started will not redirect to Home in multi-column UI (https://github.com/tootsuite/mastodon/pull/10835)

Improvements to the single column layout (#10835)

* Improvements to the single column layout

- Add follows and followers link to the right panel
- Increase margins around separators in right panel
- Add follow requests link with counter when account is locked to right panel

* Redirect from getting started to home when navigation panel is visible

Add a keyboard shortcut to hide/show media (#10647)

* Move control of media visibility to parent component

* Add keyboard shortcut to toggle media visibility

Docker: Keep /var/lib/apt/ to keep apt working (#10830)

Expand abbreviation to minimise confusion (#10826)

Avoid cutting bottom of letters of last paragraph of statuses (#10821)

I18n: Update Czech translation (#10832)

Add responsive panels to the single-column layout (#10820)

* Add responsive panels to the single-column layout

* Fixes

* Fix not being able to save the preference

* Fix code style issues

* Set max-height on the compose textarea and add a link to relationship manager

Merge pull request #1068 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

Use Sec-WebSocket-Protocol instead of query string to pass WebSocket token

Inspired by https://github.com/kubevirt/kubevirt/issues/1242

Forward port version bumps to 2.8.3 and 2.8.4 (#10819)

* Bump version to 2.8.3

* Bump version to 2.8.4

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

Conflicts:
- streaming/index.js

Improve streaming server security (#10818)

* Check OAuth token scopes in the streaming API

* Use Sec-WebSocket-Protocol instead of query string to pass WebSocket token

Inspired by https://github.com/kubevirt/kubevirt/issues/1242

Merge pull request #1067 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

Do not share a single Redcarpet::Markdown object across threads

There are apparently thread-safety issues: https://github.com/vmg/redcarpet/pull/672