From b57913b13ad07cfaa345f7d1e964cd37e5545aa5 Mon Sep 17 00:00:00 2001
From: KokaKiwi <kokakiwi@kokakiwi.net>
Date: Sun, 3 Mar 2019 18:33:02 +0100
Subject: Fix supported TLS versions as TLS 1.3 support seems buggy.

---
 config/config.exs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index a620e7451..e6a21104c 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -133,7 +133,14 @@ config :pleroma, :httpoison, Pleroma.HTTP
 config :tesla, adapter: Tesla.Adapter.Hackney
 
 # Configures http settings, upstream proxy etc.
-config :pleroma, :http, proxy_url: nil
+config :pleroma, :http,
+  proxy_url: nil,
+  adapter: [
+    ssl_options: [
+      # We don't support TLS v1.3 yet
+      versions: [:tlsv1, :"tlsv1.1", :"tlsv1.2"]
+    ]
+  ]
 
 config :pleroma, :instance,
   name: "Pleroma",
-- 
cgit v1.2.3


From a283a1fcd026f33ecdd246fef6d035f95b2071a1 Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Wed, 6 Mar 2019 02:25:13 +0100
Subject: Add default config for masto_fe

Related to: https://git.pleroma.social/pleroma/mastofe/merge_requests/22
---
 config/config.exs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index a620e7451..a867dd0bc 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -215,6 +215,9 @@ config :pleroma, :frontend_configurations,
     scopeCopy: true,
     subjectLineBehavior: "email",
     alwaysShowSubjectInput: true
+  },
+  masto_fe: %{
+    showInstanceSpecificPanel: true
   }
 
 config :pleroma, :activitypub,
-- 
cgit v1.2.3


From bc7570c282ea45d2d0d4b44c4a07b5d0bda2fea8 Mon Sep 17 00:00:00 2001
From: Maksim <parallel588@gmail.com>
Date: Wed, 6 Mar 2019 13:20:12 +0000
Subject: [#647] tests for web push

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

(limited to 'config')

diff --git a/config/test.exs b/config/test.exs
index fbeba0919..6dfa698c8 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -44,6 +44,8 @@ config :web_push_encryption, :vapid_details,
     "BLH1qVhJItRGCfxgTtONfsOKDc9VRAraXw-3NsmjMngWSh7NxOizN6bkuRA7iLTMPS82PjwJAr3UoK9EC1IFrz4",
   private_key: "_-XZ0iebPrRfZ_o0-IatTdszYa8VCH1yLN-JauK7HHA"
 
+config :web_push_encryption, :http_client, Pleroma.Web.WebPushHttpClientMock
+
 config :pleroma, Pleroma.Jobs, testing: [max_jobs: 2]
 
 try do
-- 
cgit v1.2.3


From 5021b7836fd0aabd2253416ec48dfcba60a1227c Mon Sep 17 00:00:00 2001
From: Ekaterina Vaartis <vaartis@cock.li>
Date: Thu, 7 Mar 2019 00:13:26 +0300
Subject: Fetch user's outbox posts on first federation with that user

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

(limited to 'config')

diff --git a/config/config.exs b/config/config.exs
index a867dd0bc..2b9aabf80 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -348,6 +348,10 @@ config :pleroma, Pleroma.Jobs,
   federator_outgoing: [max_jobs: 50],
   mailer: [max_jobs: 10]
 
+config :pleroma, :fetch_initial_posts,
+  enabled: false,
+  pages: 5
+
 config :auto_linker,
   opts: [
     scheme: true,
-- 
cgit v1.2.3