From 44c1a895b5b55c0e687c9f0cfb254da540057362 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Tue, 2 Dec 2014 21:25:43 -0800
Subject: [PATCH] move two user related "other" settings to "user"

---
 config/site_settings.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/config/site_settings.yml b/config/site_settings.yml
index 2b6eb17b4..c076ba425 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -285,6 +285,10 @@ users:
     default: false
   email_token_valid_hours: 24
   email_token_grace_period_hours: 0
+  purge_inactive_users_grace_period_days: 7
+  public_user_custom_fields:
+    type: list
+    default: ''
 
 posting:
   min_post_length:
@@ -792,10 +796,6 @@ uncategorized:
 
   notify_about_flags_after: 48
 
-  public_user_custom_fields:
-    type: list
-    default: ''
-
   enable_cdn_js_debugging: false
 
   show_create_topics_notice:
@@ -807,7 +807,6 @@ uncategorized:
     default: true
 
   disable_edit_notifications: false
-  purge_inactive_users_grace_period_days: 7
 
   company_full_name: 'My Unconfigured Forum Ltd.'
   company_short_name: 'Unconfigured Forum'