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 pull request #34 from sharelatex/csh-ho-docker-issue-1338-grunt

Browse source 
Merged Additional issue 1338 for real-time
This commit is contained in:
Christopher Hoskin 2019-01-08 14:57:09 +00:00 committed by GitHub
commit afaf045d15
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/real-time/.gitignore vendored
View file

@ -4,4 +4,4 @@ app.js
app/js app/js
test/unit/js test/unit/js
test/acceptance/js test/acceptance/js
app.js.map **/*.map

6
services/real-time/npm-shrinkwrap.json generated
View file

@ -1896,9 +1896,9 @@
"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz" "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"
}, },
"settings-sharelatex": { "settings-sharelatex": {
"version": "1.0.0", "version": "1.1.0",
"from": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0", "from": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.1.0",
"resolved": "git+https://github.com/sharelatex/settings-sharelatex.git#cbc5e41c1dbe6789721a14b3fdae05bf22546559", "resolved": "git+https://github.com/sharelatex/settings-sharelatex.git#93f63d029b52fef8825c3a401b2b6a7ba29b4750",
"dependencies": { "dependencies": {
"coffee-script": { "coffee-script": {
"version": "1.6.0", "version": "1.6.0",

2
services/real-time/package.json
View file

@ -33,7 +33,7 @@
"redis-sharelatex": "git+https://github.com/sharelatex/redis-sharelatex.git#v1.0.4", "redis-sharelatex": "git+https://github.com/sharelatex/redis-sharelatex.git#v1.0.4",
"request": "~2.34.0", "request": "~2.34.0",
"session.socket.io": "^0.1.6", "session.socket.io": "^0.1.6",
"settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0", "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.1.0",
"socket.io": "0.9.16", "socket.io": "0.9.16",
"socket.io-client": "^0.9.16" "socket.io-client": "^0.9.16"
}, },