Merge branch 'master' into zen-mode

circle.yml

@@ -37,7 +37,7 @@ dependencies:
 
     # Install node dependencies.
     - yarn --version
-    - yarn global add node-gyp nsp --force
+    - yarn global add node-gyp --force
     - yarn
 
   post:
@@ -59,8 +59,6 @@ test:
     - yarn test
     # Run the end to end tests
     - yarn e2e:ci
-    # Check dependancies using nsp.
-    - nsp check
 
 deployment:
   release:

client/coral-embed-stream/src/graphql/index.js

@@ -198,7 +198,7 @@ export default {
           { mutationResult: { data: { createComment: { comment } } } }
         ) => {
           if (
-            (prev.me.role !== 'ADMIN' &&
+            (!['ADMIN', 'MODERATOR'].includes(prev.me.role) &&
               prev.asset.settings.moderation === 'PRE') ||
             comment.status === 'PREMOD' ||
             comment.status === 'REJECTED' ||