summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/config.exs3
-rw-r--r--config/test.exs2
2 files changed, 5 insertions, 0 deletions
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,
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