projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feat/enforce-admin-scope-unconditionally' into 'develop'
[akkoma]
/
lib
/
pleroma
/
reverse_proxy
/
client
/
tesla.ex
diff --git
a/lib/pleroma/reverse_proxy/client/tesla.ex
b/lib/pleroma/reverse_proxy/client/tesla.ex
index d5a339681a752d6ae301ed08c33a49ca4b36353f..36a0a2060959257a4e3e7a662e6a8beec271add2 100644
(file)
--- a/
lib/pleroma/reverse_proxy/client/tesla.ex
+++ b/
lib/pleroma/reverse_proxy/client/tesla.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.ReverseProxy.Client.Tesla do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.ReverseProxy.Client.Tesla do
@@
-28,7
+28,7
@@
defmodule Pleroma.ReverseProxy.Client.Tesla do
url,
body,
headers,
url,
body,
headers,
- Keyword.put(opts, :adapter, opts)
+ opts
) do
if is_map(response.body) and method != :head do
{:ok, response.status, response.headers, response.body}
) do
if is_map(response.body) and method != :head do
{:ok, response.status, response.headers, response.body}