Merge remote-tracking branch 'upstream/master'

swgriffith · Mar 25, 2020 · e7e26c1 · e7e26c1
2 parents 3752dbc + 5d4c13b
commit e7e26c1
Show file tree

Hide file tree

Showing 36 changed files with 4,810 additions and 12,290 deletions.
diff --git a/app-experimental/auth-api/package-lock.json b/app-experimental/auth-api/package-lock.json
diff --git a/app-experimental/cache-api/package-lock.json b/app-experimental/cache-api/package-lock.json
diff --git a/app-experimental/cache-api/package.json b/app-experimental/cache-api/package.json
@@ -14,7 +14,7 @@
     "cookie-parser": "~1.4.3",
     "debug": "~2.6.9",
     "express": "~4.16.0",
-    "hbs": "^4.0.4",
+    "hbs": "^4.1.0",
     "http-errors": "~1.6.2",
     "moment": "^2.22.2",
     "morgan": "^1.9.1",

diff --git a/app-experimental/data-api/src/Gemfile.lock b/app-experimental/data-api/src/Gemfile.lock
@@ -18,7 +18,7 @@ GEM
       bson (>= 4.3.0, < 5.0.0)
     multi_json (1.13.1)
     mustermann (1.0.2)
-    rack (2.0.6)
+    rack (2.0.8)
     rack-protection (2.0.3)
       rack
     sinatra (2.0.3)