From 07d8d5ed75e0e42c1778190275930f4f94fdd9d4 Mon Sep 17 00:00:00 2001
From: riking <rikingcoding@gmail.com>
Date: Fri, 11 Jul 2014 12:35:17 -0700
Subject: [PATCH] Change default email_in minimum trust to 2

Also, rename MinTrustToCreateTopicSetting to TrustLevelSetting, and apply it to more settings
---
 ...e_topic_setting.rb => trust_level_setting.rb} |  2 +-
 config/site_settings.yml                         | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)
 rename app/models/{min_trust_to_create_topic_setting.rb => trust_level_setting.rb} (84%)

diff --git a/app/models/min_trust_to_create_topic_setting.rb b/app/models/trust_level_setting.rb
similarity index 84%
rename from app/models/min_trust_to_create_topic_setting.rb
rename to app/models/trust_level_setting.rb
index a38031d1bf9..bb777485d3e 100644
--- a/app/models/min_trust_to_create_topic_setting.rb
+++ b/app/models/trust_level_setting.rb
@@ -1,6 +1,6 @@
 require_dependency 'enum_site_setting'
 
-class MinTrustToCreateTopicSetting < EnumSiteSetting
+class TrustLevelSetting < EnumSiteSetting
 
   def self.valid_value?(val)
     valid_values.any? { |v| v.to_s == val.to_s }
diff --git a/config/site_settings.yml b/config/site_settings.yml
index c919d0c71a8..ca749c54cbf 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -381,8 +381,8 @@ email:
     default: ''
     type: email
   email_in_min_trust:
-    default: 3
-    enum: 'MinTrustToCreateTopicSetting'
+    default: 2
+    enum: 'TrustLevelSetting'
   email_in_category: -1
   email_prefix: ''
   email_site_title: ''
@@ -442,14 +442,18 @@ files:
     default: false
 
 trust:
-  default_trust_level: 0
-  default_invitee_trust_level: 1
+  default_trust_level:
+    default: 0
+    enum: 'TrustLevelSetting'
+  default_invitee_trust_level:
+    default: 1
+    enum: 'TrustLevelSetting'
   min_trust_to_create_topic:
     default: 0
-    enum: 'MinTrustToCreateTopicSetting'
+    enum: 'TrustLevelSetting'
   min_trust_to_edit_wiki_post:
     default: 1
-    enum: 'MinTrustToCreateTopicSetting'
+    enum: 'TrustLevelSetting'
   basic_requires_topics_entered: 5
   basic_requires_read_posts: 30
   basic_requires_time_spent_mins: 10