Merge pull request #1138 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

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

Conflicts:
- app/models/media_attachment.rb
  Upstream added audio attachment support
- app/serializers/initial_state_serializer.rb
  Upstream added audio attachment support and how mimetypes are returned
- app/serializers/rest/instance_serializer.rb
  Upstream added a few fields
- config/application.rb
  Upstream added a different paperclip transcoder

Add audio uploads (#11123)

* Add audio uploads

Fix #4827

Accept uploads of OGG, WAV, FLAC, OPUS and MP3 files, and converts
them to OGG. Media attachments get a new `audio` type. In the UI,
audio uploads are displayed identically to video uploads.

* Improve code style

Merge pull request #1102 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

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

Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb

Put poll options behind content warnings (#10983)

* Put poll options behind CWs in WebUI

* Put polls behind CWs on public pages

* Add poll icon to public pages CWs

* Revert to not showing an icon in the CW button

Merge pull request #1076 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

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

Fix React warning about legacy lifecycle calls and sensitive status resetting (#10872)

Merge pull request #1073 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

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

Merge pull request #1072 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

Fix poll visibility on public pages (#10817)

* Fix poll visibility on public pages

* Revert "Fix poll visibility on public pages"

This reverts commit 54a9608add6f855bc6337fe3c65eaee7ba13db49.

* Revert "Change poll options to alphabetic letters when status text is hidden"

This reverts commit c53d67326201b2061990b1874a3547c3647f50d2.

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

Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb

Conflicts due to the addition of a new preference upstream,
“advanced layout”.

Fix null error in status component when determining showMedia state (#10838)

* Fix null error in status component when determining showMedia state

Also update the showMedia value if the status passed to the
component changes

* Refactor media visibility computation into a defaultMediaVisibility function

* Fix default media visibility with reblogs

Add a keyboard shortcut to hide/show media (#10647)

* Move control of media visibility to parent component

* Add keyboard shortcut to toggle media visibility

Merge pull request #1054 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

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

Change poll options to alphabetic letters when status text is hidden (#10685)

Fix #10569

Merge pull request #1032 from ThibG/glitch-soc/merge-upstream

Merge upstream changes