From 5850408a329aae41dddfce4e9bafab8dd9f8e974 Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Tue, 20 Oct 2020 11:10:07 -0400
Subject: [PATCH] Update gems

Rack, Sinatra, etc.
---
 Gemfile      |  3 ++-
 Gemfile.lock | 42 +++++++++++++++++++++++-------------------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/Gemfile b/Gemfile
index c51cca394..5dd7def90 100644
--- a/Gemfile
+++ b/Gemfile
@@ -40,8 +40,9 @@ gem 'coder'
 gem 'redlock'
 
 gem 'puma'
+gem 'rack', '>= 2.1.4'
 gem 'rack-ssl'
-gem 'sinatra'
+gem 'sinatra', '>= 2.0'
 gem 'jwt'
 gem 'libhoney'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index c049a4dd6..f63ebc296 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -90,7 +90,7 @@ GEM
     atomic (1.1.99)
     avl_tree (1.2.1)
       atomic (~> 1.1)
-    backports (3.8.0)
+    backports (3.18.2)
     bourne (1.6.0)
       mocha (~> 1.1)
     builder (3.2.3)
@@ -145,8 +145,10 @@ GEM
     minitest (5.11.3)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.12.1)
+    multi_json (1.15.0)
     multipart-post (2.0.0)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
     nio4r (2.5.2)
@@ -156,13 +158,13 @@ GEM
       method_source (~> 0.9.0)
     puma (4.3.5)
       nio4r (~> 2.0)
-    rack (1.6.12)
-    rack-protection (1.5.5)
+    rack (2.2.3)
+    rack-protection (2.1.0)
       rack
     rack-ssl (1.4.1)
       rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
     rake (13.0.1)
     redis (3.3.5)
     redis-namespace (1.5.2)
@@ -183,6 +185,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
+    ruby2_keywords (0.0.2)
     safe_yaml (1.0.4)
     sentry-raven (2.4.0)
       faraday (>= 0.7.6, < 1.0)
@@ -193,19 +196,19 @@ GEM
       redis (>= 3.3.4, < 5)
     sidekiq-pro (3.5.3)
       sidekiq (>= 4.1.5)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    sinatra-contrib (1.4.7)
-      backports (>= 2.0)
+    sinatra (2.1.0)
+      mustermann (~> 1.0)
+      rack (~> 2.2)
+      rack-protection (= 2.1.0)
+      tilt (~> 2.0)
+    sinatra-contrib (2.1.0)
       multi_json
-      rack-protection
-      rack-test
-      sinatra (~> 1.4.0)
-      tilt (>= 1.3, < 3)
+      mustermann (~> 1.0)
+      rack-protection (= 2.1.0)
+      sinatra (= 2.1.0)
+      tilt (~> 2.0)
     thread_safe (0.3.6)
-    tilt (2.0.8)
+    tilt (2.0.10)
     travis-encrypt (0.0.5)
     travis-rollout (0.0.2)
     tzinfo (1.2.5)
@@ -244,6 +247,7 @@ DEPENDENCIES
   pg
   pry
   puma
+  rack (>= 2.1.4)
   rack-ssl
   rack-test
   rake
@@ -255,7 +259,7 @@ DEPENDENCIES
   sentry-raven
   sidekiq-pro!
   simple_states!
-  sinatra
+  sinatra (>= 2.0)
   sinatra-contrib
   travis-config!
   travis-encrypt
@@ -271,4 +275,4 @@ RUBY VERSION
    ruby 2.4.9p362
 
 BUNDLED WITH
-   1.17.3
+   2.1.4