Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '19bc3e76ea1d7fa2d9af711613a77fc0f5f0d1b5' into glitch-soc/main

Browse Source 
Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream added a helper to insert javascript tags, close to where we had
  modified code.
  Ported upstream's change.
This commit is contained in:
Claire
2026-01-13 18:30:48 +01:00
parent 7f98a6703e 19bc3e76ea
commit b4ed1e6c99
14 changed files with 145 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/paperclip/attachment_extensions.rb
View File

@@ -16,8 +16,7 @@ module Paperclip
# if we're processing the original, close + unlink the source tempfile
intermediate_files << original if name == :original
@queued_for_write[name] = style.processors
.inject(original) do |file, processor|
@queued_for_write[name] = style.processors.inject(original) do |file, processor|
file = Paperclip.processor(processor).make(file, style.processor_options, self)
intermediate_files << file unless file == original
file