From 2ef5f471abe4611c9b56a5e66fadec299bc5d21a Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane.kilkelly@overleaf.com>
Date: Fri, 24 Jul 2020 10:14:48 +0100
Subject: [PATCH 1/2] Upgrade to redis-sharelatex 1.0.13

---
 services/document-updater/package-lock.json | 34 ++++++++++-----------
 services/document-updater/package.json      |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/services/document-updater/package-lock.json b/services/document-updater/package-lock.json
index 6d838e6217..1ca191a283 100644
--- a/services/document-updater/package-lock.json
+++ b/services/document-updater/package-lock.json
@@ -1581,6 +1581,14 @@
       "resolved": "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.0.tgz",
       "integrity": "sha512-2Nii8p3RwAPiFwsnZvukotvow2rIHM+yQ6ZcBXGHdniadkYGZYiGmkHJIbZPIV9nfv7m/U1IPMVVcAhoWFeklw=="
     },
+    "coffee-script": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.8.0.tgz",
+      "integrity": "sha1-nJ8dK0pSoADe0Vtll5FwNkgmPB0=",
+      "requires": {
+        "mkdirp": "~0.3.5"
+      }
+    },
     "color-convert": {
       "version": "1.9.3",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -3397,9 +3405,9 @@
       }
     },
     "ioredis": {
-      "version": "4.16.1",
-      "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.16.1.tgz",
-      "integrity": "sha512-g76Mm9dE7BLuewncu1MimGZw5gDDjDwjoRony/VoSxSJEKAhuYncDEwYKYjtHi2NWsTNIB6XXRjE64uVa/wpKQ==",
+      "version": "4.17.3",
+      "resolved": "https://registry.npmjs.org/ioredis/-/ioredis-4.17.3.tgz",
+      "integrity": "sha512-iRvq4BOYzNFkDnSyhx7cmJNOi1x/HWYe+A4VXHBu4qpwJaGT1Mp+D2bVGJntH9K/Z/GeOM/Nprb8gB3bmitz1Q==",
       "requires": {
         "cluster-key-slot": "^1.1.0",
         "debug": "^4.1.1",
@@ -5586,7 +5594,7 @@
     "redis-commands": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.5.0.tgz",
-      "integrity": "sha1-gNLiBpj+aI8icSf/nlFkp90X54U="
+      "integrity": "sha512-6KxamqpZ468MeQC3bkWmCB1fp56XL64D4Kf0zJSwDZbVLLm7KFkoIcHrgRvQ+sk8dnhySs7+yBg94yIkAK7aJg=="
     },
     "redis-errors": {
       "version": "1.2.0",
@@ -5611,25 +5619,17 @@
       }
     },
     "redis-sharelatex": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/redis-sharelatex/-/redis-sharelatex-1.0.12.tgz",
-      "integrity": "sha512-Z+LDGaRNgZ+NiDaCC/R0N3Uy6SCtbKXqiXlvCwAbIQRSZUc69OVx/cQ3i5qDF7zeERhh+pnTd+zGs8nVfa5p+Q==",
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/redis-sharelatex/-/redis-sharelatex-1.0.13.tgz",
+      "integrity": "sha512-sAQNofqfcMlIxzxNJF1qUspJKDM1VuuIOrGZQX9nb5JtcJ5cusa5sc+Oyb51eymPV5mZGWT3u07tKtv4jdXVIg==",
       "requires": {
         "async": "^2.5.0",
         "coffee-script": "1.8.0",
-        "ioredis": "~4.16.1",
+        "ioredis": "~4.17.3",
         "redis-sentinel": "0.1.1",
         "underscore": "1.7.0"
       },
       "dependencies": {
-        "coffee-script": {
-          "version": "1.8.0",
-          "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.8.0.tgz",
-          "integrity": "sha512-EvLTMcu9vR6G1yfnz75yrISvhq1eBPC+pZbQhHzTiC5vXgpYIrArxQc5tB+SYfBi3souVdSZ4AZzYxI72oLXUw==",
-          "requires": {
-            "mkdirp": "~0.3.5"
-          }
-        },
         "underscore": {
           "version": "1.7.0",
           "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
@@ -6199,7 +6199,7 @@
     "standard-as-callback": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.0.1.tgz",
-      "integrity": "sha1-7YuyVkjhWDF1m2Ajvbh+a2CzgSY="
+      "integrity": "sha512-NQOxSeB8gOI5WjSaxjBgog2QFw55FV8TkS6Y07BiB3VJ8xNTvUYm0wl0s8ObgQ5NhdpnNfigMIKjgPESzgr4tg=="
     },
     "statsd-parser": {
       "version": "0.0.4",
diff --git a/services/document-updater/package.json b/services/document-updater/package.json
index 3f0b1e2de0..04484720ea 100644
--- a/services/document-updater/package.json
+++ b/services/document-updater/package.json
@@ -26,7 +26,7 @@
     "logger-sharelatex": "^1.9.1",
     "metrics-sharelatex": "^2.6.2",
     "mongojs": "^3.1.0",
-    "redis-sharelatex": "^1.0.12",
+    "redis-sharelatex": "^1.0.13",
     "request": "^2.88.2",
     "requestretry": "^4.1.0",
     "settings-sharelatex": "^1.1.0"

From f331c89da5fe8988aa61d805593ecc33ee07cad9 Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane.kilkelly@overleaf.com>
Date: Fri, 24 Jul 2020 11:14:20 +0100
Subject: [PATCH 2/2] Fix integrity hash on coffee-script dependency

---
 services/document-updater/package-lock.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/document-updater/package-lock.json b/services/document-updater/package-lock.json
index 1ca191a283..8bc91495cb 100644
--- a/services/document-updater/package-lock.json
+++ b/services/document-updater/package-lock.json
@@ -1584,7 +1584,7 @@
     "coffee-script": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.8.0.tgz",
-      "integrity": "sha1-nJ8dK0pSoADe0Vtll5FwNkgmPB0=",
+      "integrity": "sha512-EvLTMcu9vR6G1yfnz75yrISvhq1eBPC+pZbQhHzTiC5vXgpYIrArxQc5tB+SYfBi3souVdSZ4AZzYxI72oLXUw==",
       "requires": {
         "mkdirp": "~0.3.5"
       }