Merge branch 'master' of https://github.com/sharelatex/web-sharelatex

services/web/config/settings.defaults.coffee

@@ -117,8 +117,8 @@ module.exports =
 	siteUrl : siteUrl = 'http://localhost:3000'
 
 	# cookie domain
-	# use full domain for cookies to only be accesabble from that domain,
-	# replace subdomain with dot to have them accessable on all subdomains
+	# use full domain for cookies to only be accessible from that domain,
+	# replace subdomain with dot to have them accessible on all subdomains
 	# cookieDomain: ".sharelatex.dev"
 	cookieName:"sharelatex.sid"
 

services/web/test/UnitTests/coffee/Compile/CompileControllerTests.coffee

@@ -144,7 +144,7 @@ describe "CompileController", ->
 				@req.query = {pdfng:false}
 				@RateLimiter.addCount.callsArgWith(1, null, true)
 				@CompileController.proxyToClsi = (project_id, url)=>
-					@RateLimiter.addCount.args[0][0].throttle.should.equal 100
+					@RateLimiter.addCount.args[0][0].throttle.should.equal 1000
 					done()
 				@CompileController.downloadPdf @req, @res