projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'openapi/use-boolean-like-in-requests' into 'develop'
[akkoma]
/
lib
/
pleroma
/
user.ex
diff --git
a/lib/pleroma/user.ex
b/lib/pleroma/user.ex
index a86cc3202ffca42c5966d3492387eb944691241f..cba39107220dfa234a4867ec575d09ed1f127939 100644
(file)
--- a/
lib/pleroma/user.ex
+++ b/
lib/pleroma/user.ex
@@
-9,7
+9,6
@@
defmodule Pleroma.User do
import Ecto.Query
import Ecto, only: [assoc: 2]
import Ecto.Query
import Ecto, only: [assoc: 2]
- alias Comeonin.Pbkdf2
alias Ecto.Multi
alias Pleroma.Activity
alias Pleroma.Config
alias Ecto.Multi
alias Pleroma.Activity
alias Pleroma.Config
@@
-1926,7
+1925,7
@@
defmodule Pleroma.User do
defp put_password_hash(
%Ecto.Changeset{valid?: true, changes: %{password: password}} = changeset
) do
defp put_password_hash(
%Ecto.Changeset{valid?: true, changes: %{password: password}} = changeset
) do
- change(changeset, password_hash: Pbkdf2.hash
pw
salt(password))
+ change(changeset, password_hash: Pbkdf2.hash
_pwd_
salt(password))
end
defp put_password_hash(changeset), do: changeset
end
defp put_password_hash(changeset), do: changeset