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

diff --cc .env.production.sample
index a64959c7755fdb2a9e912217aa1318c42d6ed421,d66b0505095821de1beb2f4a2e9a6c05b3454121..1fe5c70afe3934eb0fda79bb989fdafcd1fd79f1
--- 1/.env.production.sample
--- 2/.env.production.sample
+++ b/.env.production.sample
@@@ -153,31 -153,7 +153,28 @@@ STREAMING_CLUSTER_NUM=
  # If you use Docker, you may want to assign UID/GID manually.
  # UID=1000
  # GID=1000
 + 
 +# Maximum allowed character count
 +# MAX_TOOT_CHARS=500
 +
 +# Maximum number of pinned posts
 +# MAX_PINNED_TOOTS=5
 +
 +# Maximum allowed bio characters
 +# MAX_BIO_CHARS=500
 +
 +# Maximim number of profile fields allowed
 +# MAX_PROFILE_FIELDS=4
 +
 +# Maximum allowed display name characters
 +# MAX_DISPLAY_NAME_CHARS=30
 +
 +# Maximum image and video upload sizes
 +# Units are in bytes
 +# 1048576 bytes equals 1 megabyte
 +# MAX_IMAGE_SIZE=8388608
 +# MAX_VIDEO_SIZE=41943040
  
- # Maximum length of audio uploads in seconds
- # MAX_AUDIO_LENGTH=60
- 
  # LDAP authentication (optional)
  # LDAP_ENABLED=true
  # LDAP_HOST=localhost

diff --cc app/controllers/settings/identity_proofs_controller.rb
Simple merge

diff --cc app/javascript/mastodon/locales/defaultMessages.json
Simple merge

diff --cc app/javascript/mastodon/locales/en.json
Simple merge

diff --cc app/javascript/mastodon/locales/ja.json
Simple merge

diff --cc app/javascript/styles/mastodon/components.scss
Simple merge

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

diff --cc app/models/media_attachment.rb
index 70a671b4a96bfc9477f959fab65016029dca6ef4,30d9a985125cdc194e987319353d76d504848a11..815ac0258c42336d6f91b3e0c0fe05764fbeecac
--- 1/app/models/media_attachment.rb
--- 2/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@@ -28,12 -28,12 +28,12 @@@ class MediaAttachment < ApplicationReco
  
    IMAGE_FILE_EXTENSIONS = ['.jpg', '.jpeg', '.png', '.gif', '.webp'].freeze
    VIDEO_FILE_EXTENSIONS = ['.webm', '.mp4', '.m4v', '.mov'].freeze
-   AUDIO_FILE_EXTENSIONS = ['.mp3', '.m4a', '.wav', '.ogg'].freeze
 -  AUDIO_FILE_EXTENSIONS = ['.ogg', '.oga', '.mp3', '.wav', '.flac', '.opus'].freeze
++  AUDIO_FILE_EXTENSIONS = ['.ogg', '.oga', '.mp3', '.m4a', '.wav', '.flac', '.opus'].freeze
  
    IMAGE_MIME_TYPES             = ['image/jpeg', 'image/png', 'image/gif', 'image/webp'].freeze
-   VIDEO_MIME_TYPES             = ['video/webm', 'video/mp4', 'video/quicktime'].freeze
+   VIDEO_MIME_TYPES             = ['video/webm', 'video/mp4', 'video/quicktime', 'video/ogg'].freeze
    VIDEO_CONVERTIBLE_MIME_TYPES = ['video/webm', 'video/quicktime'].freeze
-   AUDIO_MIME_TYPES             = ['audio/mpeg', 'audio/mp4', 'audio/vnd.wav', 'audio/wav', 'audio/x-wav', 'audio/x-wave', 'audio/ogg',].freeze
 -  AUDIO_MIME_TYPES             = ['audio/wave', 'audio/wav', 'audio/x-wav', 'audio/x-pn-wave', 'audio/ogg', 'audio/mpeg', 'audio/mp3', 'audio/webm', 'audio/flac'].freeze
++  AUDIO_MIME_TYPES             = ['audio/wave', 'audio/wav', 'audio/x-wav', 'audio/x-wave', 'audio/vdn.wav', 'audio/x-pn-wave', 'audio/ogg', 'audio/mpeg', 'audio/mp3', 'audio/mp4', 'audio/webm', 'audio/flac'].freeze
  
    BLURHASH_OPTIONS = {
      x_comp: 4,
@@@ -101,8 -98,13 +98,13 @@@
      },
    }.freeze
  
 -  IMAGE_LIMIT = 8.megabytes
 -  VIDEO_LIMIT = 40.megabytes
+   VIDEO_CONVERTED_STYLES = {
+     small: VIDEO_STYLES[:small],
+     original: VIDEO_FORMAT,
+   }.freeze
+ 
 +  IMAGE_LIMIT = (ENV['MAX_IMAGE_SIZE'] || 8.megabytes).to_i
 +  VIDEO_LIMIT = (ENV['MAX_VIDEO_SIZE'] || 40.megabytes).to_i
  
    belongs_to :account,          inverse_of: :media_attachments, optional: true
    belongs_to :status,           inverse_of: :media_attachments, optional: true

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

diff --cc app/serializers/initial_state_serializer.rb
Simple merge

diff --cc app/serializers/rest/instance_serializer.rb
index 98c53c84a12977044de93c8a16282468db917d2e,1bd71683ce83b0bba180166fd7d2d2d6b77e1313..e913f0c64fd0dccaad5940c4e496a153224f7586
--- 1/app/serializers/rest/instance_serializer.rb
--- 2/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@@ -3,9 -3,9 +3,9 @@@
  class REST::InstanceSerializer < ActiveModel::Serializer
    include RoutingHelper
  
-   attributes :uri, :title, :description, :email,
+   attributes :uri, :title, :short_description, :description, :email,
 -             :version, :urls, :stats, :thumbnail,
 +             :version, :urls, :stats, :thumbnail, :max_toot_chars, :poll_limits,
-              :languages, :registrations
+              :languages, :registrations, :approval_required
  
    has_one :contact_account, serializer: REST::AccountSerializer
  

diff --cc app/services/post_status_service.rb
Simple merge

diff --cc app/views/stream_entries/_simple_status.html.haml
Simple merge

diff --cc config/initializers/doorkeeper.rb
Simple merge

diff --cc config/locales/doorkeeper.en.yml
Simple merge

diff --cc config/locales/pl.yml
Simple merge

diff --cc config/locales/simple_form.ja.yml
Simple merge

diff --cc config/routes.rb
Simple merge

diff --cc lib/mastodon/version.rb
Simple merge