From: Thibaut Girka <thib@sitedethib.com>
Date: Tue, 18 Dec 2018 15:55:15 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=034ffc079e40e0c723173b5998242803cc28dc50;p=mastodon.git

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.
---

034ffc079e40e0c723173b5998242803cc28dc50
diff --cc app/controllers/admin/base_controller.rb
index f2190ddf9,7b81a2b01..cc6cd51f0
--- a/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/javascript/mastodon/features/compose/components/compose_form.js
index 4b56c7fdd,ac458fd25..d6add9b0d
--- a/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') {