Merge branch 'master' into akismet

client/coral-admin/src/components/Drawer.js

@@ -44,7 +44,7 @@ const CoralDrawer = ({ handleLogout, auth = {} }) => (
               {t('configure.configure')}
             </Link>
           )}
-          <a onClick={handleLogout}>Sign Out</a>
+          <a onClick={handleLogout}>{t('configure.sign_out')}</a>
           <span>{`v${process.env.VERSION}`}</span>
         </Navigation>
       </div>

client/coral-admin/src/routes/Moderation/components/ModerationQueue.js

@@ -421,7 +421,7 @@ class ModerationQueue extends React.Component {
             dangling={
               !this.props.commentBelongToQueue(this.props.activeTab, comment)
             }
-          />;
+          />
         </div>
       );
     }

services/users.js

@@ -21,7 +21,7 @@ const debug = require('debug')('talk:services:users');
 const UserModel = require('../models/user');
 
 const RECAPTCHA_WINDOW = '10m'; // 10 minutes.
-const RECAPTCHA_INCORRECT_TRIGGER = 5; // after 3 incorrect attempts, recaptcha will be required.
+const RECAPTCHA_INCORRECT_TRIGGER = 5; // after 5 incorrect attempts, recaptcha will be required.
 
 const ActionsService = require('./actions');
 const mailer = require('./mailer');