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

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

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/application_controller.rb
index 599c640629b078d3339f64fe0b4f4f8d06bfa679,ca5229f7966d08cc9c12cf0454009286dcbbc8a1..f1a4f0d0274af254b78828ca2d588425af217e87
--- 1/app/controllers/application_controller.rb
--- 2/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)
-     render "errors/#{code}", layout: 'error', status: code
 +    use_pack 'error'
+     render "errors/#{code}", layout: 'error', status: code, formats: [:html]
    end
  end

diff --cc app/javascript/mastodon/features/compose/components/poll_form.js
index 791a4b1ada939ddb94ab26c8b3a20f97a6f57510,e9bbb4ba4e45b9eab7a501bef948c9d39de38551..ba245f4d3be720f7a81f657c67733c35cd488564
--- 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
@@@ -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>

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

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge