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

Conflicts:
- `app/models/media_attachment.rb`:
  Upstream moved hardcoded values around, while in glitch-soc they are
  configurable.
  Moved them like upstream, but keeping glitch-soc's ability to configure
  them through env vars.

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

diff --cc app/models/media_attachment.rb
index 9eaacdc03634e8072396d142ab676c79f08432fd,a3115637e51555d2632fa0f58f542d0d67fd1d1a..4b38d729ea0f7adbfb3a0707a66c8eec38897998
--- 1/app/models/media_attachment.rb
--- 2/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@@ -38,6 -38,12 +38,12 @@@ class MediaAttachment < ApplicationReco
  
    MAX_DESCRIPTION_LENGTH = 1_500
  
 -  IMAGE_LIMIT = 10.megabytes
 -  VIDEO_LIMIT = 40.megabytes
++  IMAGE_LIMIT = (ENV['MAX_IMAGE_SIZE'] || 10.megabytes).to_i
++  VIDEO_LIMIT = (ENV['MAX_VIDEO_SIZE'] || 40.megabytes).to_i
+ 
+   MAX_VIDEO_MATRIX_LIMIT = 2_304_000 # 1920x1200px
+   MAX_VIDEO_FRAME_RATE   = 60
+ 
    IMAGE_FILE_EXTENSIONS = %w(.jpg .jpeg .png .gif).freeze
    VIDEO_FILE_EXTENSIONS = %w(.webm .mp4 .m4v .mov).freeze
    AUDIO_FILE_EXTENSIONS = %w(.ogg .oga .mp3 .wav .flac .opus .aac .m4a .3gp .wma).freeze