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

2021-09-14 13:50:30 +02:00
parent 7aa4d481db 121c7a7847
commit f1e6884d6b
13 changed files with 376 additions and 388 deletions
--- a/app/views/notification_mailer/_status.html.haml
+++ b/app/views/notification_mailer/_status.html.haml
@@ -37,7 +37,7 @@
                                  %p
                                    - status.media_attachments.each do |a|
                                      - if status.local?
-                                        = link_to medium_url(a), medium_url(a)
+                                        = link_to full_asset_url(a.file.url(:original)), full_asset_url(a.file.url(:original))
                                      - else
                                        = link_to a.remote_url, a.remote_url