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

2019-02-15 18:02:45 +01:00
parent 2769b54466 8ef50706a1
commit 06cc04fd23
30 changed files with 408 additions and 148 deletions
--- a/app/javascript/mastodon/features/compose/components/upload.js
+++ b/app/javascript/mastodon/features/compose/components/upload.js
@ -108,9 +108,8 @@ class Upload extends ImmutablePureComponent {
                <label>
                  <span style={{ display: 'none' }}>{intl.formatMessage(messages.description)}</span>

-                  <input
+                  <textarea
                    placeholder={intl.formatMessage(messages.description)}
-                    type='text'
                    value={description}
                    maxLength={420}
                    onFocus={this.handleInputFocus}