projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
16d8c8b
)
Revert "Assert on the success of enqueue before returning"
author
Sadposter
<hannah+pleroma@coffee-and-dreams.uk>
Sun, 14 Apr 2019 15:12:54 +0000
(16:12 +0100)
committer
Sadposter
<hannah+pleroma@coffee-and-dreams.uk>
Sun, 14 Apr 2019 15:12:54 +0000
(16:12 +0100)
This reverts commit
16d8c8b33b654b88e5e934832d5e26eb7152633e
.
Because it breaks everything
lib/pleroma/user.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/user.ex
b/lib/pleroma/user.ex
index f3ea5289e9396ee86b836f44b16a280cc0dec8f7..78eb29ddd8839dc73bee3dac5905cb63ebf59030 100644
(file)
--- a/
lib/pleroma/user.ex
+++ b/
lib/pleroma/user.ex
@@
-278,10
+278,9
@@
defmodule Pleroma.User do
def try_send_confirmation_email(%User{} = user) do
if user.info.confirmation_pending &&
Pleroma.Config.get([:instance, :account_activation_required]) do
- :ok =
- user
- |> Pleroma.Emails.UserEmail.account_confirmation_email()
- |> Pleroma.Emails.Mailer.deliver_async()
+ user
+ |> Pleroma.Emails.UserEmail.account_confirmation_email()
+ |> Pleroma.Emails.Mailer.deliver_async()
{:ok, :enqueued}
else