From fddea9e3ceb11ce2f749d23e7f3c2fa6d6c8df83 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 7 Oct 2020 10:34:24 -0500
Subject: :pubsub is deprecated and replaced wit :pubsub_server

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

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 2e6b0796a..0c73ecb59 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -143,7 +143,7 @@ config :pleroma, Pleroma.Web.Endpoint,
   secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl",
   signing_salt: "CqaoopA2",
   render_errors: [view: Pleroma.Web.ErrorView, accepts: ~w(json)],
-  pubsub: [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2],
+  pubsub_server: Pleroma.PubSub,
   secure_cookie_flag: true,
   extra_cookie_attrs: [
     "SameSite=Lax"
-- 
cgit v1.2.3


From 87fc5a40f4cf5aca7dab9ee5ac11bea35d1281b6 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 7 Oct 2020 11:52:23 -0500
Subject: instrumenters has no effect in Endpoint anymore

---
 config/config.exs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 0c73ecb59..47fc7957b 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -123,7 +123,6 @@ websocket_config = [
 
 # Configures the endpoint
 config :pleroma, Pleroma.Web.Endpoint,
-  instrumenters: [Pleroma.Web.Endpoint.Instrumenter],
   url: [host: "localhost"],
   http: [
     ip: {127, 0, 0, 1},
-- 
cgit v1.2.3


From 405f27b4f8c430ddf7c47b09c5c693f5a17bcbc2 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Fri, 16 Oct 2020 17:41:44 +0000
Subject: The suggestions are problematic as they need to be real local account
 names

---
 config/description.exs | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index 2a1898922..0da1da57d 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -829,13 +829,7 @@ config :pleroma, :config_description, [
         key: :autofollowed_nicknames,
         type: {:list, :string},
         description:
-          "Set to nicknames of (local) users that every new user should automatically follow",
-        suggestions: [
-          "lain",
-          "kaniini",
-          "lanodan",
-          "rinpatch"
-        ]
+          "Set to nicknames of (local) users that every new user should automatically follow"
       },
       %{
         key: :attachment_links,
-- 
cgit v1.2.3