diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-06-05 12:54:30 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-06-05 12:54:30 +0700 |
| commit | 6ba9055b51a454baaf063943e72a39006f7e5fad (patch) | |
| tree | ca54523b21a7fe5a5ef0c99b2032fc0f899d40a8 /lib/pleroma/user | |
| parent | 9ce928d8238877f870e099cb2fe010d322717856 (diff) | |
| parent | 5188add534a1532ef323a0fec3503f8e96dfe762 (diff) | |
| download | pleroma-6ba9055b51a454baaf063943e72a39006f7e5fad.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
Diffstat (limited to 'lib/pleroma/user')
| -rw-r--r-- | lib/pleroma/user/info.ex | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/pleroma/user/info.ex b/lib/pleroma/user/info.ex index fb9ab92ab..08e43ff0f 100644 --- a/lib/pleroma/user/info.ex +++ b/lib/pleroma/user/info.ex @@ -55,6 +55,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? @@ -220,6 +222,7 @@ defmodule Pleroma.User.Info do :hide_favorites, :background, :show_role, + :skip_thread_containment, :pleroma_settings_store ]) end |