Merge pull request #34 from sharelatex/csh-ho-docker-issue-1338-grunt

  Merged Additional issue 1338 for real-time

services/real-time/.gitignore

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

services/real-time/npm-shrinkwrap.json

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

services/real-time/package.json

@@ -33,7 +33,7 @@
     "redis-sharelatex": "git+https://github.com/sharelatex/redis-sharelatex.git#v1.0.4",
     "request": "~2.34.0",
     "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-client": "^0.9.16"
   },