github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Henry Oswald 2015-11-25 11:08:04 +00:00
commit 5213be4fe9
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/web/config/settings.defaults.coffee
View file

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

2
services/web/test/UnitTests/coffee/Compile/CompileControllerTests.coffee
View file

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