From 4a3711aba89c91812d0d0a221121e95b753572a9 Mon Sep 17 00:00:00 2001
From: Christopher Hoskin <christopher.hoskin@gmail.com>
Date: Tue, 8 Jan 2019 14:26:05 +0000
Subject: [PATCH 1/2] Bump settings to v1.1.0

---
 services/real-time/npm-shrinkwrap.json | 6 +++---
 services/real-time/package.json        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/real-time/npm-shrinkwrap.json b/services/real-time/npm-shrinkwrap.json
index 34ebae2f58..6b39192931 100644
--- a/services/real-time/npm-shrinkwrap.json
+++ b/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",
diff --git a/services/real-time/package.json b/services/real-time/package.json
index 0e5b5ee55e..5277ec536d 100644
--- a/services/real-time/package.json
+++ b/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"
   },

From 3288d6d3211faa77bc666878926f19b585ef20d2 Mon Sep 17 00:00:00 2001
From: Christopher Hoskin <christopher.hoskin@gmail.com>
Date: Tue, 8 Jan 2019 14:28:10 +0000
Subject: [PATCH 2/2] Add **/*.map to .gitignore

---
 services/real-time/.gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/real-time/.gitignore b/services/real-time/.gitignore
index 22adf4a227..ff0c7e15d2 100644
--- a/services/real-time/.gitignore
+++ b/services/real-time/.gitignore
@@ -4,4 +4,4 @@ app.js
 app/js
 test/unit/js
 test/acceptance/js
-app.js.map
+**/*.map