Merge branch 'master' into fix-routes-mount-path

coralproject · Aug 21, 2017 · 170ca04 · 170ca04
2 parents 65e56d3 + ccf978f
commit 170ca04
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/config.js b/config.js
@@ -153,7 +153,7 @@ const CONFIG = {
   DISABLE_AUTOFLAG_SUSPECT_WORDS: process.env.TALK_DISABLE_AUTOFLAG_SUSPECT_WORDS === 'TRUE',
 
   // TRUST_THRESHOLDS defines the thresholds used for automoderation.
-  TRUST_THRESHOLDS: process.env.TRUST_THRESHOLDS || 'comment:-1,-1;flag:-1,-1'
+  TRUST_THRESHOLDS: process.env.TRUST_THRESHOLDS || 'comment:2,-1;flag:2,-1'
 };
 
 //==============================================================================

diff --git a/docs/_docs/02-01-configuration.md b/docs/_docs/02-01-configuration.md
@@ -177,7 +177,7 @@ Trust can auto-moderate comments based on user history. By specifying this
 option, the behavior can be changed to offer different results.
 
 - `TRUST_THRESHOLDS` (_optional_) - configure the reliability thresholds for
-  flagging and commenting. (Default `comment:-1,-1;flag:-1,-1`)
+  flagging and commenting. (Default `comment:2,-1;flag:2,-1`)
 
 The form of the environment variable:
 

diff --git a/services/karma.js b/services/karma.js
@@ -19,7 +19,7 @@ const {
  *
  * The default used is:
  *
- *  comment:-1,-1;flag:-1,-1
+ *  comment:2,-2;flag:2,-2
  */
 const parseThresholds = (thresholds) => thresholds
   .split(';')