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

Conflicts:
- app/controllers/admin/base_controller.rb
  Some refactoring made upstream, no real conflict.
- app/javascript/mastodon/features/compose/components/compose_form.js
  Updated using upstream's code but using maxChars instead of the
  hardcoded length of 500 characters per toot.
- app/javascript/styles/mastodon/components.scss
  Upstream redesigned the onboarding modal. Not sure why we had a
  conflict there.

diff --cc Dockerfile
Simple merge

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/admin/base_controller.rb
index f2190ddf9b74e980b4e6dd9f4789fb247c227ac9,7b81a2b01d1b4a7b52cb4e32d74c4a9222282446..cc6cd51f0b794da9404c81cf2939c6bf5434941d
--- 1/app/controllers/admin/base_controller.rb
--- 2/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@@@ -17,8 -16,8 +17,12 @@@ module Admi
        @body_classes = 'admin'
      end
  
 +    def set_pack
 +      use_pack 'admin'
 +    end
++
+     def set_user
+       @user = Account.find(params[:account_id]).user || raise(ActiveRecord::RecordNotFound)
+     end
    end
  end

diff --cc app/controllers/directories_controller.rb
Simple merge

diff --cc app/javascript/mastodon/features/compose/components/compose_form.js
index 4b56c7fddb3b5967c6b90d8bf85943db208e9052,ac458fd2592a799d8e17d8481bd7474a49efd4d8..d6add9b0d4f3c9bfddc656b060387bb291acc7c3
--- 1/app/javascript/mastodon/features/compose/components/compose_form.js
--- 2/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@@ -82,10 -82,10 +83,10 @@@ class ComposeForm extends ImmutablePure
      }
  
      // Submit disabled:
-     const { is_submitting, is_uploading, anyMedia } = this.props;
+     const { is_submitting, is_changing_upload, is_uploading, anyMedia } = this.props;
      const fulltext = [this.props.spoiler_text, countableText(this.props.text)].join('');
  
-     if (is_submitting || is_uploading || length(fulltext) > maxChars || (fulltext.length !== 0 && fulltext.trim().length === 0 && !anyMedia)) {
 -    if (is_submitting || is_uploading || is_changing_upload || length(fulltext) > 500 || (fulltext.length !== 0 && fulltext.trim().length === 0 && !anyMedia)) {
++    if (is_submitting || is_uploading || is_changing_upload || length(fulltext) > maxChars || (fulltext.length !== 0 && fulltext.trim().length === 0 && !anyMedia)) {
        return;
      }
  
@@@ -161,7 -161,7 +162,7 @@@
      const { intl, onPaste, showSearch, anyMedia } = this.props;
      const disabled = this.props.is_submitting;
      const text     = [this.props.spoiler_text, countableText(this.props.text)].join('');
-     const disabledButton = disabled || this.props.is_uploading || length(text) > maxChars || (text.length !== 0 && text.trim().length === 0 && !anyMedia);
 -    const disabledButton = disabled || this.props.is_uploading || this.props.is_changing_upload || length(text) > 500 || (text.length !== 0 && text.trim().length === 0 && !anyMedia);
++    const disabledButton = disabled || this.props.is_uploading || this.props.is_changing_upload || length(text) > maxChars || (text.length !== 0 && text.trim().length === 0 && !anyMedia);
      let publishText = '';
  
      if (this.props.privacy === 'private' || this.props.privacy === 'direct') {

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

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

diff --cc app/javascript/styles/mastodon/components.scss
Simple merge

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

diff --cc app/views/layouts/public.html.haml
Simple merge

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

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

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

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

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

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

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

diff --cc config/routes.rb
Simple merge