move defaults from sample_config.exs to config.exs

2019-01-09 17:02:30 +07:00 · 2019-01-09 17:02:30 +07:00 · 28afcb7c31
commit 28afcb7c31
parent 48591aab98
2 changed files with 3 additions and 3 deletions
--- 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
--- 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,