From 9a7b817c9a785171368a9b6d61122c7b4b33547c Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Wed, 20 Mar 2019 15:59:27 +0300
Subject: Ecto 3.0.5 migration

kms
---
 config/config.exs | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index ccdd35777..c20802faf 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -8,8 +8,6 @@ use Mix.Config
 # General application configuration
 config :pleroma, ecto_repos: [Pleroma.Repo]
 
-config :pleroma, Pleroma.Repo, types: Pleroma.PostgresTypes
-
 config :pleroma, Pleroma.Captcha,
   enabled: false,
   seconds_valid: 60,
@@ -273,8 +271,6 @@ config :pleroma, :media_proxy,
 
 config :pleroma, :chat, enabled: true
 
-config :ecto, json_library: Jason
-
 config :phoenix, :format_encoders, json: Jason
 
 config :pleroma, :gopher,
-- 
cgit v1.2.3


From 8468f3f6d48693d2a27a257e5555aa71decff3df Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 20 Mar 2019 21:09:36 +0100
Subject: Add safe dm mode option.

---
 config/config.exs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index ccdd35777..b01c097c5 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -174,7 +174,8 @@ config :pleroma, :instance,
   no_attachment_links: false,
   welcome_user_nickname: nil,
   welcome_message: nil,
-  max_report_comment_size: 1000
+  max_report_comment_size: 1000,
+  safe_dm_mentions: false
 
 config :pleroma, :markup,
   # XXX - unfortunately, inline images must be enabled by default right now, because
-- 
cgit v1.2.3


From 9a39d1d84613bb11542a0628e8b762970bd18bd0 Mon Sep 17 00:00:00 2001
From: Egor <egor@kislitsyn.com>
Date: Fri, 29 Mar 2019 12:46:05 +0000
Subject: Replace Pleroma.Jobs with `pleroma_job_queue`

---
 config/config.exs | 8 ++++----
 config/test.exs   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index bd8922b77..0df38d75a 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -348,10 +348,10 @@ config :pleroma, Pleroma.Web.Federator.RetryQueue,
   initial_timeout: 30,
   max_retries: 5
 
-config :pleroma, Pleroma.Jobs,
-  federator_incoming: [max_jobs: 50],
-  federator_outgoing: [max_jobs: 50],
-  mailer: [max_jobs: 10]
+config :pleroma_job_queue, :queues,
+  federator_incoming: 50,
+  federator_outgoing: 50,
+  mailer: 10
 
 config :pleroma, :fetch_initial_posts,
   enabled: false,
diff --git a/config/test.exs b/config/test.exs
index 3691e5bd1..6a7b9067e 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -48,7 +48,7 @@ config :web_push_encryption, :vapid_details,
 
 config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock
 
-config :pleroma, Pleroma.Jobs, testing: [max_jobs: 2]
+config :pleroma_job_queue, disabled: true
 
 try do
   import_config "test.secret.exs"
-- 
cgit v1.2.3


From d5a1e08bf1aed97ff4708844a52eaf5b155a6002 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Sun, 31 Mar 2019 17:46:17 -0500
Subject: Add default mail adapter settings to config

---
 config/config.exs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 0df38d75a..dccf7b263 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -378,6 +378,8 @@ config :pleroma, :ldap,
   base: System.get_env("LDAP_BASE") || "dc=example,dc=com",
   uid: System.get_env("LDAP_UID") || "cn"
 
+config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Sendmail
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"
-- 
cgit v1.2.3