diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-10-29 14:51:23 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-10-29 14:51:23 +0400 |
| commit | 8542d2efee86131350736a9be96713551e01f6ed (patch) | |
| tree | 070a7a5693766e2a9e7ad31782f59d224c7dac4e /config | |
| parent | 1bfd8528bbc71c8c34253eb245de7df498064fb4 (diff) | |
| parent | 0e0a6aef70fc0cac1f9176e4f50a7fe4930242fa (diff) | |
| download | pleroma-8542d2efee86131350736a9be96713551e01f6ed.tar.gz pleroma-8542d2efee86131350736a9be96713551e01f6ed.zip | |
Merge remote-tracking branch 'origin/develop' into feature/local-only-scope
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | config/description.exs | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index bd611fd42..c52ee8f82 100644 --- a/config/config.exs +++ b/config/config.exs @@ -234,6 +234,7 @@ config :pleroma, :instance, "text/bbcode" ], autofollowed_nicknames: [], + autofollowing_nicknames: [], max_pinned_statuses: 1, attachment_links: false, max_report_comment_size: 1000, diff --git a/config/description.exs b/config/description.exs index 55363c45a..0bfa9979f 100644 --- a/config/description.exs +++ b/config/description.exs @@ -832,6 +832,12 @@ config :pleroma, :config_description, [ "Set to nicknames of (local) users that every new user should automatically follow" }, %{ + key: :autofollowing_nicknames, + type: {:list, :string}, + description: + "Set to nicknames of (local) users that automatically follows every newly registered user" + }, + %{ key: :attachment_links, type: :boolean, description: "Enable to automatically add attachment link text to statuses" |