Merge branch 'master' into banned-words

client/coral-embed-stream/src/containers/Comment.js

@@ -96,6 +96,7 @@ const withCommentFragments = withFragments({
   asset: gql`
     fragment CoralEmbedStream_Comment_asset on Asset {
       __typename
+      id
       ${getSlotFragmentSpreads(slots, 'asset')}
     }
     `,

routes/index.js

@@ -89,7 +89,7 @@ if (process.env.NODE_ENV !== 'production') {
   // Interactive graphiql interface.
   router.use('/api/v1/graph/iql', (req, res) => {
     res.render('graphiql', {
-      endpointURL: `${req.locals.BASE_URL}api/v1/graph/ql`
+      endpointURL: `${req.app.locals.BASE_URL}api/v1/graph/ql`
     });
   });