From b751f704363cb86c56bf6c91af3c4967ca0ba212 Mon Sep 17 00:00:00 2001 From: Nate Stemen Date: Thu, 20 Dec 2018 13:56:51 -0500 Subject: [PATCH] bump settings-sharelatex version to latest release --- services/chat/decaffeinate.sh | 2 +- services/chat/npm-shrinkwrap.json | 6 +++--- services/chat/package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/chat/decaffeinate.sh b/services/chat/decaffeinate.sh index 0039d30cc4..a2958457ab 100755 --- a/services/chat/decaffeinate.sh +++ b/services/chat/decaffeinate.sh @@ -4,7 +4,7 @@ curl -o .eslintrc https://raw.githubusercontent.com/sharelatex/web-sharelatex-in curl -o .prettierrc https://raw.githubusercontent.com/sharelatex/web-sharelatex-internal/master/.prettierrc?token=AMHVk45yPk51AJkmy-hYGoHI9gW-kZHvks5cHAu3wA%3D%3D git add . -git commit -m "add rc files" +git commit -m "Decaffeinate: add eslint and prettier rc files" npx bulk-decaffeinate convert --dir app/coffee diff --git a/services/chat/npm-shrinkwrap.json b/services/chat/npm-shrinkwrap.json index 15a3346a36..49daedbb17 100644 --- a/services/chat/npm-shrinkwrap.json +++ b/services/chat/npm-shrinkwrap.json @@ -6195,15 +6195,15 @@ } }, "settings-sharelatex": { - "version": "git+https://github.com/sharelatex/settings-sharelatex.git#cbc5e41c1dbe6789721a14b3fdae05bf22546559", - "from": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0", + "version": "git+https://github.com/sharelatex/settings-sharelatex.git#93f63d029b52fef8825c3a401b2b6a7ba29b4750", + "from": "git+https://github.com/sharelatex/settings-sharelatex.git#1.1.0", "requires": { "coffee-script": "1.6.0" }, "dependencies": { "coffee-script": { "version": "1.6.0", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.0.tgz", + "resolved": "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.0.tgz", "integrity": "sha1-gIs5bhEPU9AhoZpO8fZb4OjjX6M=" } } diff --git a/services/chat/package.json b/services/chat/package.json index 3dc250746e..d9a8aa3d2d 100644 --- a/services/chat/package.json +++ b/services/chat/package.json @@ -28,7 +28,7 @@ "mongojs": "2.4.0", "redis": "~0.10.1", "request": "^2.79.0", - "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#v1.0.0", + "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#1.1.0", "v8-profiler": "^5.6.5" }, "devDependencies": {