Merge branch 'master' into production

This commit is contained in:
Nick Winter 2014-10-24 14:46:46 -07:00
commit 614feab16f

View file

@ -32,7 +32,7 @@ setupExpressMiddleware = (app) ->
express.logger.format('prod', productionLogging)
app.use(express.logger('prod'))
app.use express.compress filter: (req, res) ->
#return false if req.headers.host is 'codecombat.com' # CloudFlare will gzip it for us on codecombat.com # But now it's disabled.
return false if req.headers.host is 'codecombat.com' # CloudFlare will gzip it for us on codecombat.com # But now it's disabled.
compressible res.getHeader('Content-Type')
else
app.use(express.logger('dev'))