From: Thibaut Girka <thib@sitedethib.com>
Date: Thu, 12 Dec 2019 14:40:06 +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=be4849c08306cce930ea27e1f8097ffb774f75c6;p=mastodon.git

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

Conflicts:
- app/controllers/application_controller.rb
  Minor conflict due to glitch-soc's theming system
---

be4849c08306cce930ea27e1f8097ffb774f75c6
diff --cc app/controllers/application_controller.rb
index 599c64062,ca5229f79..f1a4f0d02
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@@ -211,7 -136,6 +211,7 @@@ class ApplicationController < ActionCon
    end
  
    def respond_with_error(code)
 +    use_pack 'error'
-     render "errors/#{code}", layout: 'error', status: code
+     render "errors/#{code}", layout: 'error', status: code, formats: [:html]
    end
  end
diff --cc app/javascript/mastodon/features/compose/components/poll_form.js
index 791a4b1ad,e9bbb4ba4..ba245f4d3
--- a/app/javascript/mastodon/features/compose/components/poll_form.js
+++ b/app/javascript/mastodon/features/compose/components/poll_form.js
@@@ -153,9 -153,9 +153,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} onBlur={this.handleSelectDuration}>
+           <select value={expiresIn} onChange={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>