diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-09-08 11:26:12 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-09-08 11:26:12 +0000 |
| commit | a08196ca680554315e088e9ea4191f292bbe2642 (patch) | |
| tree | e38dad4a9fd0d566859755aec6c40f4f3a62fd2d /lib/pleroma/http/http.ex | |
| parent | 6a567a131ec04dbeb71012f2caeebf563ed453a4 (diff) | |
| parent | d34dc4a7469b97e28ca4fffc8b2387c937ab56d8 (diff) | |
| download | pleroma-fix/disable-favicons-in-tests.tar.gz | |
Merge branch 'develop' into 'fix/disable-favicons-in-tests'fix/disable-favicons-in-tests
# Conflicts:
# config/test.exs
Diffstat (limited to 'lib/pleroma/http/http.ex')
| -rw-r--r-- | lib/pleroma/http/http.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/http/http.ex b/lib/pleroma/http/http.ex index 7bc73f4a0..052597191 100644 --- a/lib/pleroma/http/http.ex +++ b/lib/pleroma/http/http.ex @@ -60,7 +60,7 @@ defmodule Pleroma.HTTP do {:ok, Env.t()} | {:error, any()} def request(method, url, body, headers, options) when is_binary(url) do uri = URI.parse(url) - adapter_opts = AdapterHelper.options(uri, options[:adapter] || []) + adapter_opts = AdapterHelper.options(uri, options || []) options = put_in(options[:adapter], adapter_opts) params = options[:params] || [] |