diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-05-07 18:21:59 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-05-07 18:21:59 +0200 |
| commit | 50b430d9a2857edf8ab44e9b94c7bcb14ecd2117 (patch) | |
| tree | 4932ca1d8e52f6ce9b8b9fbb304b6bfce4027e54 /lib/paperclip/transcoder_extensions.rb | |
| parent | a346912030012dc1451249373ff7ef1a61016517 (diff) | |
| parent | d8e0c8a89e1f1dd1c4ce1513deaeb3c85c6e4a42 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
- `app/views/statuses/_simple_status.html.haml`: Small markup change in glitch-soc, on a line that has been modified by upstream. Ported upstream changes.
Diffstat (limited to 'lib/paperclip/transcoder_extensions.rb')
| -rw-r--r-- | lib/paperclip/transcoder_extensions.rb | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/lib/paperclip/transcoder_extensions.rb b/lib/paperclip/transcoder_extensions.rb deleted file mode 100644 index c0b2447f3..000000000 --- a/lib/paperclip/transcoder_extensions.rb +++ /dev/null @@ -1,14 +0,0 @@ -# frozen_string_literal: true - -module Paperclip - module TranscoderExtensions - # Prevent the transcoder from modifying our meta hash - def initialize(file, options = {}, attachment = nil) - meta_value = attachment&.instance_read(:meta) - super - attachment&.instance_write(:meta, meta_value) - end - end -end - -Paperclip::Transcoder.prepend(Paperclip::TranscoderExtensions) |