projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[#1364] Resolved merge conflicts with `develop`.
[akkoma]
/
test
/
support
/
builders
/
user_builder.ex
diff --git
a/test/support/builders/user_builder.ex
b/test/support/builders/user_builder.ex
index 4bdaddc4abadbe598c21c26065a09615ce257133..fcfea666f1a2f517f2b8a698e632cc0f1c1a9728 100644
(file)
--- a/
test/support/builders/user_builder.ex
+++ b/
test/support/builders/user_builder.ex
@@
-11,7
+11,7
@@
defmodule Pleroma.Builders.UserBuilder do
bio: "A tester.",
ap_id: "some id",
last_digest_emailed_at: NaiveDateTime.truncate(NaiveDateTime.utc_now(), :second),
-
info: %
{}
+
notification_settings: %Pleroma.User.NotificationSetting
{}
}
Map.merge(user, data)