From c57d730d5b54fa20cff4fa190f9a21350f4ca1ff Mon Sep 17 00:00:00 2001
From: Plastikmensch <plastikmensch@users.noreply.github.com>
Date: Wed, 9 Aug 2023 16:22:48 +0200
Subject: [PATCH] Set `default_content_type` default from settings.yml
Glitch-soc used to allow setting the default content type for new users by changing the setting in settings.yml.
Since the refactor of user settings, changing it had no effect.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---
app/models/user_settings.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/models/user_settings.rb b/app/models/user_settings.rb
index 22a90d3de4..a1b86e1f27 100644
--- a/app/models/user_settings.rb
+++ b/app/models/user_settings.rb
@@ -16,7 +16,7 @@ class UserSettings
setting :default_language, default: nil
setting :default_sensitive, default: false
setting :default_privacy, default: nil, in: %w(public unlisted private)
- setting :default_content_type, default: 'text/plain'
+ setting :default_content_type, default: -> { ::Setting.default_content_type }
setting :hide_followers_count, default: false
namespace :web do