diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-07-05 19:35:56 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-07-05 19:35:56 +0200 |
| commit | 2d8be0a6e1fbe9da892937b05b373ab907d89b77 (patch) | |
| tree | 73eb669adcc8b13c63dded5a887cb5ecc817894d /lib/paperclip/image_extractor.rb | |
| parent | 9b3677d5097fb50f90a6abdce9d722e81d2db469 (diff) | |
| parent | 99f3a5554074d9a12619797c474b3de4c6085f02 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `.env.production.sample`: Upstream changed it completely. Changed ours to merge upstream's new structure, but keeping most of the information.
Diffstat (limited to 'lib/paperclip/image_extractor.rb')
| -rw-r--r-- | lib/paperclip/image_extractor.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/paperclip/image_extractor.rb b/lib/paperclip/image_extractor.rb index f5a54d1a5..aab675a06 100644 --- a/lib/paperclip/image_extractor.rb +++ b/lib/paperclip/image_extractor.rb @@ -43,7 +43,7 @@ module Paperclip begin cli.run - rescue Cocaine::ExitStatusError + rescue Cocaine::ExitStatusError, ::Av::CommandError dst.close(true) return nil end |