Merge branch 'master' into extendable-embed-stream-tab

client/coral-admin/src/routes/Moderation/containers/Comment.js

@@ -47,6 +47,9 @@ export default withFragments({
       editing {
         edited
       }
+      status_history {
+        type
+      }
       hasParent
       ${getSlotFragmentSpreads(slots, 'comment')}
       ...${getDefinitionName(CommentLabels.fragments.comment)}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "talk",
-  "version": "3.7.1",
+  "version": "3.8.0",
   "description": "A better commenting experience from Mozilla, The New York Times, and the Washington Post. https://coralproject.net",
   "main": "app.js",
   "private": true,

services/passport.js

@@ -515,5 +515,6 @@ module.exports = {
   HandleAuthPopupCallback,
   HandleGenerateCredentials,
   HandleLogout,
-  CheckBlacklisted
+  CheckBlacklisted,
+  CheckRecaptcha,
 };