diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-07-27 12:29:18 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-07-27 12:29:18 -0500 |
| commit | 6747bf2e1642d7715a9f08469247bc99ff7165cb (patch) | |
| tree | 9161918fc6979ac2fa1f41f203a1e42cd89fc7c8 /config/config.exs | |
| parent | 6931dbfa582f0e5360e74dffdceee1b9ed564b17 (diff) | |
| parent | 2a3abfd326f0cbb588dfe66a23e9783be3038a5e (diff) | |
| download | pleroma-6747bf2e1642d7715a9f08469247bc99ff7165cb.tar.gz pleroma-6747bf2e1642d7715a9f08469247bc99ff7165cb.zip | |
Merge remote-tracking branch 'upstream/develop' into by-approval
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index c5465ae2c..d8bf921bb 100644 --- a/config/config.exs +++ b/config/config.exs @@ -226,8 +226,6 @@ config :pleroma, :instance, autofollowed_nicknames: [], max_pinned_statuses: 1, attachment_links: false, - welcome_user_nickname: nil, - welcome_message: nil, max_report_comment_size: 1000, safe_dm_mentions: false, healthcheck: false, @@ -255,6 +253,20 @@ config :pleroma, :instance, ] ] +config :pleroma, :welcome, + direct_message: [ + enabled: false, + sender_nickname: nil, + message: nil + ], + email: [ + enabled: false, + sender: nil, + subject: "Welcome to <%= instance_name %>", + html: "Welcome to <%= instance_name %>", + text: "Welcome to <%= instance_name %>" + ] + config :pleroma, :feed, post_title: %{ max_length: 100, |