diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-01-09 17:02:30 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-01-09 17:02:30 +0700 |
| commit | 28afcb7c31a357e05c6cb23645539389f37a15f4 (patch) | |
| tree | 7d282e4f81c3f0fae8d0d8aca3b2f285cd3e2b50 | |
| parent | 48591aab980d92823b51d2363fcd4b64d311739a (diff) | |
| download | pleroma-28afcb7c31a357e05c6cb23645539389f37a15f4.tar.gz | |
move defaults from sample_config.exs to config.exs
| -rw-r--r-- | config/config.exs | 3 | ||||
| -rw-r--r-- | lib/mix/tasks/pleroma/sample_config.eex | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index 4f4e2368a..9301758f0 100644 --- a/config/config.exs +++ b/config/config.exs @@ -138,7 +138,8 @@ config :pleroma, :instance, ], finmoji_enabled: true, mrf_transparency: true, - autofollowed_nicknames: [] + autofollowed_nicknames: [], + max_pinned_statuses: 1 config :pleroma, :markup, # XXX - unfortunately, inline images must be enabled by default right now, because diff --git a/lib/mix/tasks/pleroma/sample_config.eex b/lib/mix/tasks/pleroma/sample_config.eex index 59c2c4fba..740b9f8d1 100644 --- a/lib/mix/tasks/pleroma/sample_config.eex +++ b/lib/mix/tasks/pleroma/sample_config.eex @@ -14,8 +14,7 @@ config :pleroma, :instance, email: "<%= email %>", limit: 5000, registrations_open: true, - dedupe_media: false, - max_pinned_statuses: 1 + dedupe_media: false config :pleroma, :media_proxy, enabled: false, |