projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
[akkoma]
/
lib
/
pleroma
/
uploaders
/
swift
/
keystone.ex
diff --git
a/lib/pleroma/uploaders/swift/keystone.ex
b/lib/pleroma/uploaders/swift/keystone.ex
index 3046cdbd2e374f231ba7683f190882cc095767f8..dd44c756184de98c1835ea5de710a55b9c9bcb0e 100644
(file)
--- a/
lib/pleroma/uploaders/swift/keystone.ex
+++ b/
lib/pleroma/uploaders/swift/keystone.ex
@@
-14,7
+14,7
@@
defmodule Pleroma.Uploaders.Swift.Keystone do
def process_response_body(body) do
body
def process_response_body(body) do
body
- |>
Poi
son.decode!()
+ |>
Ja
son.decode!()
end
def get_token do
end
def get_token do
@@
-38,7
+38,7
@@
defmodule Pleroma.Uploaders.Swift.Keystone do
end
def make_auth_body(username, password, tenant) do
end
def make_auth_body(username, password, tenant) do
-
Poi
son.encode!(%{
+
Ja
son.encode!(%{
:auth => %{
:passwordCredentials => %{
:username => username,
:auth => %{
:passwordCredentials => %{
:username => username,