about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/locales/en.yml6
-rw-r--r--config/settings.yml2
2 files changed, 8 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 53ce23e7c..934555da8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -505,6 +505,12 @@ en:
       timeline_preview:
         desc_html: Display public timeline on landing page
         title: Timeline preview
+      auto_reject_unknown:
+        desc_html: Automatically reject unknown accounts from newly-federated servers.
+        title: Graylist federation mode
+      auto_mark_known:
+        desc_html: Learn known accounts from outgoing interactions and incoming repeats from packmates.
+        title: Auto-learn known accounts
       title: Site settings
     statuses:
       back_to_account: Back to account page
diff --git a/config/settings.yml b/config/settings.yml
index fc2233c9f..ac2cf63a0 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -65,6 +65,8 @@ defaults: &defaults
   show_reblogs_in_public_timelines: false
   show_replies_in_public_timelines: false
   default_content_type: 'text/x-bbcode+markdown'
+  auto_reject_unknown: true
+  auto_mark_known: true
 
 development:
   <<: *defaults