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

diff --cc app/javascript/mastodon/features/compose/components/poll_form.js
index 923f1029fc03be78820513c6037722c502e70d8e,f4cd71a76e1699da16a87af75cc7d4892b7bea51..7dac950b15ab1efa5cae7e328cf33dbe97410260
--- 1/app/javascript/mastodon/features/compose/components/poll_form.js
--- 2/app/javascript/mastodon/features/compose/components/poll_form.js
+++ b/app/javascript/mastodon/features/compose/components/poll_form.js
@@@ -142,9 -142,9 +142,9 @@@ class PollForm extends ImmutablePureCom
          </ul>
  
          <div className='poll__footer'>
 -          <button disabled={options.size >= 4} className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' /> <FormattedMessage {...messages.add_option} /></button>
 +          <button disabled={options.size >= 5} className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' /> <FormattedMessage {...messages.add_option} /></button>
  
-           <select value={expiresIn} onChange={this.handleSelectDuration}>
+           <select value={expiresIn} onBlur={this.handleSelectDuration}>
              <option value={300}>{intl.formatMessage(messages.minutes, { number: 5 })}</option>
              <option value={1800}>{intl.formatMessage(messages.minutes, { number: 30 })}</option>
              <option value={3600}>{intl.formatMessage(messages.hours, { number: 1 })}</option>

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