hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix conflict

Browse source
This commit is contained in:
Roman Chvanikov 2019-06-05 02:45:21 +03:00
commit b1b1a270e8
35 changed files with 668 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/pleroma/user/info.ex
View file

@ -46,6 +46,7 @@ defmodule Pleroma.User.Info do
field(:email_notifications, :map, default: %{"digest" => false})
field(:mascot, :map, default: nil)
field(:emoji, {:array, :map}, default: [])
field(:pleroma_settings_store, :map, default: %{})
field(:notification_settings, :map,
default: %{
@ -56,6 +57,8 @@ defmodule Pleroma.User.Info do
}
)
field(:skip_thread_containment, :boolean, default: false)
# Found in the wild
# ap_id -> Where is this used?
# bio -> Where is this used?
@ -244,7 +247,9 @@ defmodule Pleroma.User.Info do
:hide_followers,
:hide_favorites,
:background,
:show_role
:show_role,
:skip_thread_containment,
:pleroma_settings_store
])
end