diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-03-14 22:33:20 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-03-14 22:33:20 +0300 |
| commit | cbdd11c38111fd7c195983f40265b675e1201d4e (patch) | |
| tree | 44c63ed6430a743cfe589fed5213467a0dd6dabb /lib/pleroma/web/media_proxy | |
| parent | 355f285a8693934fbc8205c2c9ecde0a758fc158 (diff) | |
| parent | 34fc0dca2e879bcbb73acc80fdc72678411d0ebf (diff) | |
| download | pleroma-cbdd11c38111fd7c195983f40265b675e1201d4e.tar.gz | |
Merge develop to bump elixir version in the CI so I don't get failing formatting
Diffstat (limited to 'lib/pleroma/web/media_proxy')
| -rw-r--r-- | lib/pleroma/web/media_proxy/media_proxy.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/media_proxy/media_proxy.ex b/lib/pleroma/web/media_proxy/media_proxy.ex index 39a725a69..3bd2affe9 100644 --- a/lib/pleroma/web/media_proxy/media_proxy.ex +++ b/lib/pleroma/web/media_proxy/media_proxy.ex @@ -19,7 +19,8 @@ defmodule Pleroma.Web.MediaProxy do else secret = Application.get_env(:pleroma, Pleroma.Web.Endpoint)[:secret_key_base] - # Must preserve `%2F` for compatibility with S3 (https://git.pleroma.social/pleroma/pleroma/issues/580) + # Must preserve `%2F` for compatibility with S3 + # https://git.pleroma.social/pleroma/pleroma/issues/580 replacement = get_replacement(url, ":2F:") # The URL is url-decoded and encoded again to ensure it is correctly encoded and not twice. |