Merge branch 'prevent-public-answers' into 'develop'

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 32c7fecb8403ba0d1343a4d081b373f2914d7e4a..0754749a38c96f5314fc27286baf7502b8fc13d4 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -253,25 +253,6 @@ config :pleroma, :markup,
     Pleroma.HTML.Scrubber.Default
   ]
 
-# Deprecated, will be gone in 1.0
-config :pleroma, :fe,
-  theme: "pleroma-dark",
-  logo: "/static/logo.png",
-  logo_mask: true,
-  logo_margin: "0.1em",
-  background: "/static/aurora_borealis.jpg",
-  redirect_root_no_login: "/main/all",
-  redirect_root_login: "/main/friends",
-  show_instance_panel: true,
-  scope_options_enabled: false,
-  formatting_options_enabled: false,
-  collapse_message_with_subject: false,
-  hide_post_stats: false,
-  hide_user_stats: false,
-  scope_copy: true,
-  subject_line_behavior: "email",
-  always_show_subject_input: true
-
 config :pleroma, :frontend_configurations,
   pleroma_fe: %{
     theme: "pleroma-dark",
@@ -424,8 +405,7 @@ config :pleroma_job_queue, :queues,
   mailer: 10,
   transmogrifier: 20,
   scheduled_activities: 10,
-  background: 5,
-  user: 10
+  background: 5
 
 config :pleroma, :fetch_initial_posts,
   enabled: false,