Merge branch 'develop' into issue/1383

3 files changed, 9 insertions, 22 deletions

diff --git a/config/benchmark.exs b/config/benchmark.exs
index dd99cf5fd..84c6782a2 100644
--- a/config/benchmark.exs
+++ b/config/benchmark.exs
@@ -82,3 +82,11 @@ config :pleroma, :database, rum_enabled: rum_enabled
 IO.puts("RUM enabled: #{rum_enabled}")
 
 config :pleroma, Pleroma.ReverseProxy.Client, Pleroma.ReverseProxy.ClientMock
+
+if File.exists?("./config/benchmark.secret.exs") do
+  import_config "benchmark.secret.exs"
+else
+  IO.puts(
+    "You may want to create benchmark.secret.exs to declare custom database connection parameters."
+  )
+end
diff --git a/config/config.exs b/config/config.exs
index bbd8f7d78..8b8ecc833 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -53,7 +53,7 @@ config :pleroma, Pleroma.Repo,
 
 config :pleroma, Pleroma.Captcha,
   enabled: true,
-  seconds_valid: 60,
+  seconds_valid: 300,
   method: Pleroma.Captcha.Native
 
 config :pleroma, Pleroma.Captcha.Kocaptcha, endpoint: "https://captcha.kotobank.ch"
@@ -94,10 +94,6 @@ config :pleroma, Pleroma.Uploaders.S3,
   streaming_enabled: true,
   public_endpoint: "https://s3.amazonaws.com"
 
-config :pleroma, Pleroma.Uploaders.MDII,
-  cgi: "https://mdii.sakura.ne.jp/mdii-post.cgi",
-  files: "https://mdii.sakura.ne.jp"
-
 config :pleroma, :emoji,
   shortcode_globs: ["/emoji/custom/**/*.png"],
   pack_extensions: [".png", ".gif"],
diff --git a/config/description.exs b/config/description.exs
index 94187864c..43b8cd600 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -2552,23 +2552,6 @@ config :pleroma, :config_description, [
   },
   %{
     group: :pleroma,
-    key: Pleroma.Uploaders.MDII,
-    type: :group,
-    children: [
-      %{
-        key: :cgi,
-        type: :string,
-        suggestions: ["https://mdii.sakura.ne.jp/mdii-post.cgi"]
-      },
-      %{
-        key: :files,
-        type: :string,
-        suggestions: ["https://mdii.sakura.ne.jp"]
-      }
-    ]
-  },
-  %{
-    group: :pleroma,
     key: :http,
     type: :group,
     description: "HTTP settings",