From 2fc7ce3e1e2fb746305944d40ac74da16d48f7aa Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 10 Oct 2020 01:29:41 -0500
Subject: Blocks: add blockers_visible config

---
 config/config.exs      | 1 +
 config/description.exs | 5 +++++
 2 files changed, 6 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index d53663d36..befc6840d 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -363,6 +363,7 @@ config :pleroma, :manifest,
 config :pleroma, :activitypub,
   unfollow_blocked: true,
   outgoing_blocks: true,
+  blockers_visible: true,
   follow_handshake_timeout: 500,
   note_replies_output_limit: 5,
   sign_object_fetches: true,
diff --git a/config/description.exs b/config/description.exs
index 3902b9632..4f495e828 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -2092,6 +2092,11 @@ config :pleroma, :config_description, [
         type: :boolean,
         description: "Whether to federate blocks to other instances"
       },
+      %{
+        key: :blockers_visible,
+        type: :boolean,
+        description: "Whether a user can see someone who has blocked them"
+      },
       %{
         key: :sign_object_fetches,
         type: :boolean,
-- 
cgit v1.2.3


From fa2e62078caeae415fcff7a1cc0503defd05c2de Mon Sep 17 00:00:00 2001
From: Sean King <seanking2919@protonmail.com>
Date: Thu, 15 Apr 2021 23:51:04 -0600
Subject: Remove MastoFE configuration stuff

---
 config/config.exs      |  3 ---
 config/description.exs | 21 +--------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 4381068ac..07565c557 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -322,9 +322,6 @@ config :pleroma, :frontend_configurations,
     subjectLineBehavior: "email",
     theme: "pleroma-dark",
     webPushNotifications: false
-  },
-  masto_fe: %{
-    showInstanceSpecificPanel: true
   }
 
 config :pleroma, :assets,
diff --git a/config/description.exs b/config/description.exs
index bb1f43305..bc3f11dde 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1169,7 +1169,7 @@ config :pleroma, :config_description, [
     type: :group,
     description:
       "This form can be used to configure a keyword list that keeps the configuration data for any " <>
-        "kind of frontend. By default, settings for pleroma_fe and masto_fe are configured. If you want to " <>
+        "kind of frontend. By default, settings for pleroma_fe are configured. If you want to " <>
         "add your own configuration your settings all fields must be complete.",
     children: [
       %{
@@ -1376,25 +1376,6 @@ config :pleroma, :config_description, [
             suggestions: ["pleroma-dark"]
           }
         ]
-      },
-      %{
-        key: :masto_fe,
-        label: "Masto FE",
-        type: :map,
-        description: "Settings for Masto FE",
-        suggestions: [
-          %{
-            showInstanceSpecificPanel: true
-          }
-        ],
-        children: [
-          %{
-            key: :showInstanceSpecificPanel,
-            label: "Show instance specific panel",
-            type: :boolean,
-            description: "Whenether to show the instance's specific panel"
-          }
-        ]
       }
     ]
   },
-- 
cgit v1.2.3


From b22f54eb29237b4c34a26b497f88770dbebf5578 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 16 May 2021 12:26:32 -0500
Subject: Make prod.secret.exs optional (with warning)

---
 config/prod.exs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/prod.exs b/config/prod.exs
index adbce5606..0e151000b 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -63,7 +63,12 @@ config :logger, :ex_syslogger, level: :info
 
 # Finally import the config/prod.secret.exs
 # which should be versioned separately.
-import_config "prod.secret.exs"
+if File.exists?("./config/prod.secret.exs") do
+  import_config "prod.secret.exs"
+else
+  "`config/prod.secret.exs` not found. You may want to create one by running `mix pleroma.instance gen`"
+  |> IO.warn([])
+end
 
 if File.exists?("./config/prod.exported_from_db.secret.exs"),
   do: import_config("prod.exported_from_db.secret.exs")
-- 
cgit v1.2.3


From e3173a279dad89dfce6eae89368ad3ba180c0490 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 19 May 2021 14:27:02 -0500
Subject: Put Plugs in runtime mode in :dev, :test to speed up recompilation

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

(limited to 'config')

diff --git a/config/dev.exs b/config/dev.exs
index 4faaeff5b..8e7d5c587 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -54,6 +54,10 @@ config :pleroma, Pleroma.Repo,
 
 config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true
 
+# Reduce recompilation time
+# https://dashbit.co/blog/speeding-up-re-compilation-of-elixir-projects
+config :phoenix, :plug_init_mode, :runtime
+
 if File.exists?("./config/dev.secret.exs") do
   import_config "dev.secret.exs"
 else
diff --git a/config/test.exs b/config/test.exs
index 87396a88d..007951097 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -133,6 +133,10 @@ config :pleroma, :side_effects,
   ap_streamer: Pleroma.Web.ActivityPub.ActivityPubMock,
   logger: Pleroma.LoggerMock
 
+# Reduce recompilation time
+# https://dashbit.co/blog/speeding-up-re-compilation-of-elixir-projects
+config :phoenix, :plug_init_mode, :runtime
+
 if File.exists?("./config/test.secret.exs") do
   import_config "test.secret.exs"
 else
-- 
cgit v1.2.3


From fe40f6f2910967609f7aa952d69981cadc47372c Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Thu, 20 May 2021 13:55:37 -0500
Subject: Switch from the deprecated "use Mix.config" to "import Config"

---
 config/benchmark.exs   | 2 +-
 config/config.exs      | 2 +-
 config/description.exs | 2 +-
 config/dev.exs         | 2 +-
 config/dokku.exs       | 2 +-
 config/prod.exs        | 2 +-
 config/test.exs        | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'config')

diff --git a/config/benchmark.exs b/config/benchmark.exs
index 5567ff26e..a4d048f1b 100644
--- a/config/benchmark.exs
+++ b/config/benchmark.exs
@@ -1,4 +1,4 @@
-use Mix.Config
+import Config
 
 # We don't run a server during test. If one is required,
 # you can enable the server option below.
diff --git a/config/config.exs b/config/config.exs
index 4381068ac..d333c618e 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -41,7 +41,7 @@
 #
 # This configuration file is loaded before any dependency and
 # is restricted to this project.
-use Mix.Config
+import Config
 
 # General application configuration
 config :pleroma, ecto_repos: [Pleroma.Repo]
diff --git a/config/description.exs b/config/description.exs
index bb1f43305..f00c53d28 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1,4 +1,4 @@
-use Mix.Config
+import Config
 
 websocket_config = [
   path: "/websocket",
diff --git a/config/dev.exs b/config/dev.exs
index 4faaeff5b..cfe3cce47 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -1,4 +1,4 @@
-use Mix.Config
+import Config
 
 # For development, we disable any cache and enable
 # debugging and code reloading.
diff --git a/config/dokku.exs b/config/dokku.exs
index 9ea0ec450..1cc396c3d 100644
--- a/config/dokku.exs
+++ b/config/dokku.exs
@@ -1,4 +1,4 @@
-use Mix.Config
+import Config
 
 config :pleroma, Pleroma.Web.Endpoint,
   http: [
diff --git a/config/prod.exs b/config/prod.exs
index 0e151000b..968f596e0 100644
--- a/config/prod.exs
+++ b/config/prod.exs
@@ -1,4 +1,4 @@
-use Mix.Config
+import Config
 
 # For production, we often load configuration from external
 # sources, such as your system environment. For this reason,
diff --git a/config/test.exs b/config/test.exs
index 87396a88d..c531b1290 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -1,4 +1,4 @@
-use Mix.Config
+import Config
 
 # We don't run a server during test. If one is required,
 # you can enable the server option below.
-- 
cgit v1.2.3


From 69aed310de48ccd80326c7b639d8e179dfd21ba8 Mon Sep 17 00:00:00 2001
From: Snow <xxnmacsjuyidktezdy@awdrt.com>
Date: Sat, 29 May 2021 02:22:33 +0000
Subject: Adding description

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

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index f00c53d28..1c3e3f900 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -682,7 +682,7 @@ config :pleroma, :config_description, [
       %{
         key: :allow_relay,
         type: :boolean,
-        description: "Enable Pleroma's Relay, which makes it possible to follow a whole instance"
+        description: "Enable Pleroma's Relay, which makes it possible to follow a whole instance. (Important!) This will increase the visibility of your instance."
       },
       %{
         key: :public,
-- 
cgit v1.2.3


From ff00b354fa5067c898e860e275748dd757cb04cd Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Mon, 3 Aug 2020 17:08:35 -0500
Subject: Rename the non-federating Chat feature to Shout

---
 config/config.exs      | 4 ++--
 config/description.exs | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index d333c618e..8c8ed5224 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -190,7 +190,7 @@ config :pleroma, :instance,
   instance_thumbnail: "/instance/thumbnail.jpeg",
   limit: 5_000,
   description_limit: 5_000,
-  chat_limit: 5_000,
+  shout_limit: 5_000,
   remote_limit: 100_000,
   upload_limit: 16_000_000,
   avatar_upload_limit: 2_000_000,
@@ -457,7 +457,7 @@ config :pleroma, :media_preview_proxy,
   image_quality: 85,
   min_content_length: 100 * 1024
 
-config :pleroma, :chat, enabled: true
+config :pleroma, :shoutbox, enabled: true
 
 config :phoenix, :format_encoders, json: Jason
 
diff --git a/config/description.exs b/config/description.exs
index f00c53d28..040deab96 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -545,9 +545,9 @@ config :pleroma, :config_description, [
         ]
       },
       %{
-        key: :chat_limit,
+        key: :shout_limit,
         type: :integer,
-        description: "Character limit of the instance chat messages",
+        description: "Character limit of the instance shout messages",
         suggestions: [
           5_000
         ]
@@ -2652,9 +2652,9 @@ config :pleroma, :config_description, [
   },
   %{
     group: :pleroma,
-    key: :chat,
+    key: :shout,
     type: :group,
-    description: "Pleroma chat settings",
+    description: "Pleroma shout settings",
     children: [
       %{
         key: :enabled,
-- 
cgit v1.2.3


From 68aa56b9e4fbf4697d5ff0c41cf2fe7230738fe6 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Mon, 3 Aug 2020 17:58:27 -0500
Subject: Just call it shout

---
 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 8c8ed5224..e2bf0cfc1 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -457,7 +457,7 @@ config :pleroma, :media_preview_proxy,
   image_quality: 85,
   min_content_length: 100 * 1024
 
-config :pleroma, :shoutbox, enabled: true
+config :pleroma, :shout, enabled: true
 
 config :phoenix, :format_encoders, json: Jason
 
-- 
cgit v1.2.3


From 36fe8950f78b32e4ae8b845c099498a9acda7183 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Mon, 3 Aug 2020 18:00:16 -0500
Subject: Update PleromaFE settings for the old chat box

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

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index 040deab96..a17d222ce 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1182,7 +1182,7 @@ config :pleroma, :config_description, [
             alwaysShowSubjectInput: true,
             background: "/static/aurora_borealis.jpg",
             collapseMessageWithSubject: false,
-            disableChat: false,
+            disableShout: false,
             greentext: false,
             hideFilteredStatuses: false,
             hideMutedPosts: false,
@@ -1230,10 +1230,10 @@ config :pleroma, :config_description, [
               "When a message has a subject (aka Content Warning), collapse it by default"
           },
           %{
-            key: :disableChat,
-            label: "PleromaFE Chat",
+            key: :disableShout,
+            label: "PleromaFE Shout",
             type: :boolean,
-            description: "Disables PleromaFE Chat component"
+            description: "Disables PleromaFE Shout component"
           },
           %{
             key: :greentext,
-- 
cgit v1.2.3


From d6432a65da7ad11f1383d465370c11de5a2d7ddc Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Tue, 4 Aug 2020 10:42:52 -0500
Subject: Move shout configuration from :instance, update docs and changelog

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

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index e2bf0cfc1..2f8a18788 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -190,7 +190,6 @@ config :pleroma, :instance,
   instance_thumbnail: "/instance/thumbnail.jpeg",
   limit: 5_000,
   description_limit: 5_000,
-  shout_limit: 5_000,
   remote_limit: 100_000,
   upload_limit: 16_000_000,
   avatar_upload_limit: 2_000_000,
@@ -457,7 +456,9 @@ config :pleroma, :media_preview_proxy,
   image_quality: 85,
   min_content_length: 100 * 1024
 
-config :pleroma, :shout, enabled: true
+config :pleroma, :shout,
+  enabled: true,
+  limit: 5_000
 
 config :phoenix, :format_encoders, json: Jason
 
-- 
cgit v1.2.3


From 8ff2d8d17d057d5a2e0f5df603812155d6985df0 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Tue, 4 Aug 2020 10:45:28 -0500
Subject: Update description file for new shout config setting location

---
 config/description.exs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index a17d222ce..7eecddaf5 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -544,14 +544,6 @@ config :pleroma, :config_description, [
           5_000
         ]
       },
-      %{
-        key: :shout_limit,
-        type: :integer,
-        description: "Character limit of the instance shout messages",
-        suggestions: [
-          5_000
-        ]
-      },
       %{
         key: :remote_limit,
         type: :integer,
@@ -2658,7 +2650,16 @@ config :pleroma, :config_description, [
     children: [
       %{
         key: :enabled,
-        type: :boolean
+        type: :boolean,
+        description: "Enables the backend Shoutbox chat feature."
+      },
+      %{
+        key: :limit,
+        type: :integer,
+        description: "Shout message character limit.",
+        suggestions: [
+          5_000
+        ]
       }
     ]
   },
-- 
cgit v1.2.3


From dcf84ac12e830ebc17f63e2fea0bd47c75e9f981 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Tue, 1 Jun 2021 16:53:32 -0500
Subject: disableChat / disableShout didn't actually do anything for PleromaFE

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

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index 7eecddaf5..c93a00782 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -1174,7 +1174,6 @@ config :pleroma, :config_description, [
             alwaysShowSubjectInput: true,
             background: "/static/aurora_borealis.jpg",
             collapseMessageWithSubject: false,
-            disableShout: false,
             greentext: false,
             hideFilteredStatuses: false,
             hideMutedPosts: false,
@@ -1221,12 +1220,6 @@ config :pleroma, :config_description, [
             description:
               "When a message has a subject (aka Content Warning), collapse it by default"
           },
-          %{
-            key: :disableShout,
-            label: "PleromaFE Shout",
-            type: :boolean,
-            description: "Disables PleromaFE Shout component"
-          },
           %{
             key: :greentext,
             label: "Greentext",
-- 
cgit v1.2.3


From 297feb73f4ea2de59cf3fc8f4beabe18e72a6311 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 2 Jun 2021 11:21:04 -0500
Subject: Formatting

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

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index 1c3e3f900..abd802ac0 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -682,7 +682,8 @@ config :pleroma, :config_description, [
       %{
         key: :allow_relay,
         type: :boolean,
-        description: "Enable Pleroma's Relay, which makes it possible to follow a whole instance. (Important!) This will increase the visibility of your instance."
+        description:
+          "Enable Pleroma's Relay, which makes it possible to follow a whole instance. (Important!) This will increase the visibility of your instance."
       },
       %{
         key: :public,
-- 
cgit v1.2.3


From 679d4c23e93f86f3e3fec70e0ac9bf2c9cdf8819 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@feld.me>
Date: Wed, 2 Jun 2021 11:26:26 -0500
Subject: Update wording for relays in docs and config description

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

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index abd802ac0..bdde22f98 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -683,7 +683,7 @@ config :pleroma, :config_description, [
         key: :allow_relay,
         type: :boolean,
         description:
-          "Enable Pleroma's Relay, which makes it possible to follow a whole instance. (Important!) This will increase the visibility of your instance."
+          "Permits remote instances to subscribe to all public posts of your instance. (Important!) This may increase the visibility of your instance."
       },
       %{
         key: :public,
-- 
cgit v1.2.3


From 0114754db2d9dde25b31729644f898f20121de27 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 17 Jul 2021 20:35:35 -0500
Subject: MastodonAPI: Support poll notification

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

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index 66aee3264..e58dafa74 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -552,6 +552,7 @@ config :pleroma, Oban,
     mailer: 10,
     transmogrifier: 20,
     scheduled_activities: 10,
+    poll_notifications: 10,
     background: 5,
     remote_fetcher: 2,
     attachments_cleanup: 1,
-- 
cgit v1.2.3


From 94db0b7cd604022c65b9f70e5c5a939ac3ed4801 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 27 Jul 2021 08:28:52 -0500
Subject: Add activity+json to Phoenix :format_encoders Fixes ErrorView
 rendering

---
 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 66aee3264..abedd2fbe 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -452,7 +452,7 @@ config :pleroma, :media_preview_proxy,
 
 config :pleroma, :chat, enabled: true
 
-config :phoenix, :format_encoders, json: Jason
+config :phoenix, :format_encoders, json: Jason, "activity+json": Jason
 
 config :phoenix, :json_library, Jason
 
-- 
cgit v1.2.3


From 69ebfb29fba19708aca1652bca01fb81abb092e6 Mon Sep 17 00:00:00 2001
From: Daniel <daniel.kuku@gmail.com>
Date: Tue, 27 Jul 2021 20:41:36 +0000
Subject: Update dev.exs error message to write to stderr. Currently it dumps
 this message at the beginnig of the file when using vim-autoformat with mix
 format

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

(limited to 'config')

diff --git a/config/dev.exs b/config/dev.exs
index 6b7ffb0e9..45e7f27ec 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -61,7 +61,7 @@ config :phoenix, :plug_init_mode, :runtime
 if File.exists?("./config/dev.secret.exs") do
   import_config "dev.secret.exs"
 else
-  IO.puts(
+  IO.warn(
     "!!! RUNNING IN LOCALHOST DEV MODE! !!!\nFEDERATION WON'T WORK UNTIL YOU CONFIGURE A dev.secret.exs"
   )
 end
-- 
cgit v1.2.3


From 5c5571c668ba9063b50a6af9b58e24adccaeed4a Mon Sep 17 00:00:00 2001
From: Daniel <daniel.kuku@gmail.com>
Date: Tue, 27 Jul 2021 21:01:41 +0000
Subject: use puts instead warn

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

(limited to 'config')

diff --git a/config/dev.exs b/config/dev.exs
index 45e7f27ec..ab3e83c12 100644
--- a/config/dev.exs
+++ b/config/dev.exs
@@ -61,7 +61,8 @@ config :phoenix, :plug_init_mode, :runtime
 if File.exists?("./config/dev.secret.exs") do
   import_config "dev.secret.exs"
 else
-  IO.warn(
+  IO.puts(
+    :stderr,
     "!!! RUNNING IN LOCALHOST DEV MODE! !!!\nFEDERATION WON'T WORK UNTIL YOU CONFIGURE A dev.secret.exs"
   )
 end
-- 
cgit v1.2.3


From 64002e92adcf08564d9b8e3fa2dcf7c07c72145a Mon Sep 17 00:00:00 2001
From: Ilja <domainepublic@spectraltheorem.be>
Date: Sat, 3 Oct 2020 12:08:09 +0200
Subject: config/description.exs: Update quarantine settings to tuples

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

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index 934a62a62..252aa63d8 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -687,12 +687,12 @@ config :pleroma, :config_description, [
       },
       %{
         key: :quarantined_instances,
-        type: {:list, :string},
+        type: {:list, :tuple},
         description:
-          "List of ActivityPub instances where private (DMs, followers-only) activities will not be sent",
+          "List of ActivityPub instances where private (DMs, followers-only) activities will not be sent and the reason for doing so",
         suggestions: [
-          "quarantined.com",
-          "*.quarantined.com"
+          {"quarantined.com", "Reason"},
+          {"*.quarantined.com", "Reason"}
         ]
       },
       %{
-- 
cgit v1.2.3


From f4028c908c56736b88caa5edb71f5aad21244de1 Mon Sep 17 00:00:00 2001
From: Ilja <domainepublic@spectraltheorem.be>
Date: Fri, 18 Dec 2020 14:29:38 +0100
Subject: Add key- and valuePlaceholders for quarantined_instances and
 mrf_simple

* I also added for keywordpolicy as well now. It was done in the admin-fe, but is better to be done here
* I also added comments to explain why we did the _info keys (backwards compatibility)
---
 config/description.exs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index 252aa63d8..411029c27 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -688,6 +688,8 @@ config :pleroma, :config_description, [
       %{
         key: :quarantined_instances,
         type: {:list, :tuple},
+        keyPlaceholder: "instance",
+        valuePlaceholder: "reason",
         description:
           "List of ActivityPub instances where private (DMs, followers-only) activities will not be sent and the reason for doing so",
         suggestions: [
-- 
cgit v1.2.3


From ee26f2c91b6335a086949334138877432944b208 Mon Sep 17 00:00:00 2001
From: Ilja <domainepublic@spectraltheorem.be>
Date: Sun, 17 Jan 2021 14:32:42 +0100
Subject: Quarantine placeholders

* kePlaceholder and valuePlaceholder of quarantined_instances where in wrong case, should be snake_case
* The mrf simple and transparency exclusion were already OK
---
 config/description.exs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/description.exs b/config/description.exs
index 411029c27..c72231faa 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -688,8 +688,8 @@ config :pleroma, :config_description, [
       %{
         key: :quarantined_instances,
         type: {:list, :tuple},
-        keyPlaceholder: "instance",
-        valuePlaceholder: "reason",
+        key_placeholder: "instance",
+        value_placeholder: "reason",
         description:
           "List of ActivityPub instances where private (DMs, followers-only) activities will not be sent and the reason for doing so",
         suggestions: [
-- 
cgit v1.2.3


From ce4560c2a1c194f7640accf1205e91bf40779043 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 3 Dec 2021 16:20:54 -0500
Subject: Fix benchmarks

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

(limited to 'config')

diff --git a/config/benchmark.exs b/config/benchmark.exs
index a4d048f1b..9a7ea5669 100644
--- a/config/benchmark.exs
+++ b/config/benchmark.exs
@@ -4,8 +4,7 @@ import Config
 # you can enable the server option below.
 config :pleroma, Pleroma.Web.Endpoint,
   http: [port: 4001],
-  url: [port: 4001],
-  server: true
+  url: [port: 4001]
 
 # Disable captha for tests
 config :pleroma, Pleroma.Captcha,
@@ -44,7 +43,7 @@ config :pleroma, Pleroma.Repo,
   pool_size: 10
 
 # Reduce hash rounds for testing
-config :pbkdf2_elixir, rounds: 1
+config :pleroma, :password, iterations: 1
 
 config :tesla, adapter: Tesla.Mock
 
-- 
cgit v1.2.3


From 29d80b39f287ed2488a612280d41e9dd2e40a7cc Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 15 Dec 2021 16:17:11 -0500
Subject: Add Phoenix LiveDashboard

Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
---
 config/config.exs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index b50c910b1..4a916abf5 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -139,6 +139,7 @@ config :pleroma, Pleroma.Web.Endpoint,
   ],
   protocol: "https",
   secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl",
+  live_view: [signing_salt: "U5ELgdEwTD3n1+D5s0rY0AMg8/y1STxZ3Zvsl3bWh+oBcGrYdil0rXqPMRd3Glcq"],
   signing_salt: "CqaoopA2",
   render_errors: [view: Pleroma.Web.ErrorView, accepts: ~w(json)],
   pubsub_server: Pleroma.PubSub,
-- 
cgit v1.2.3