Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'

Skip processing webp image files because we can't strip EXIF

Closes #2080

See merge request pleroma/pleroma!2924

diff --combined CHANGELOG.md
index e6180a6dac44fe5debfeb19e5991705f354866d3,527df84388e28d7498e8bd9f44a3135c86bcbfce..75442b5f0d9d0a7e56cb639b11753ff7045116af
--- 1/CHANGELOG.md
--- 2/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -5,15 -5,11 +5,15 @@@ The format is based on [Keep a Changelo
  
  ## Unreleased
  
 +### Changed
 +
 +- Renamed `:await_up_timeout` in `:connections_pool` namespace to `:connect_timeout`, old name is deprecated.
 +- Renamed `:timeout` in `pools` namespace to `:recv_timeout`, old name is deprecated.
 +
  ### Removed
  
  - **Breaking:** Removed `Pleroma.Workers.Cron.StatsWorker` setting from Oban `:crontab`.
  
 -
  ## unreleased-patch - ???
  
  ### Added
@@@ -23,12 -19,14 +23,13 @@@
  ### Fixed
  
  - Possible OOM errors with the default HTTP adapter
+ - Fixed uploading webp images when the Exiftool Upload Filter is enabled by skipping them
  - Mastodon API: Search parameter `following` now correctly returns the followings rather than the followers
  - Mastodon API: Timelines hanging for (`number of posts with links * rich media timeout`) in the worst case.
    Reduced to just rich media timeout.
  - Mastodon API: Cards being wrong for preview statuses due to cache key collision
  - Password resets no longer processed for deactivated accounts
  
 -
  ## [2.1.0] - 2020-08-28
  
  ### Changed