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

Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied upstream changes.
2021-02-12 10:28:32 +01:00
parent a30a40c437 15ced8728f
commit 5e11f3a6e1
40 changed files with 1053 additions and 831 deletions
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@ -59,7 +59,7 @@ class MediaAttachment < ApplicationRecord

  IMAGE_STYLES = {
    original: {
-      pixels: 1_638_400, # 1280x1280px
+      pixels: 2_073_600, # 1920x1080px
      file_geometry_parser: FastGeometryParser,
    }.freeze,