Merge branch 'staging' of github.com:griffithlab/civic-server into st…

…aging

Gemfile

@@ -26,7 +26,7 @@ gem 'rack-cors', '~> 1.0.5', require: 'rack/cors'
 gem 'htmlentities'
 gem 'rack-attack', '~> 6.0.0'
 
-gem 'sidekiq', '~> 6.0.3'
+gem 'sidekiq', '~> 6.2.1'
 gem 'sidekiq-cron', '~> 1.1.0'
 
 gem 'airbrake', '~> 10.0.5'

Gemfile.lock

@@ -127,7 +127,7 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.1.9)
-    connection_pool (2.2.2)
+    connection_pool (2.2.5)
     crass (1.0.6)
     daemons (1.2.6)
     database_cleaner (1.7.0)
@@ -268,8 +268,6 @@ GEM
       rack (>= 1.6.0)
     rack-mini-profiler (1.1.4)
       rack (>= 1.2.0)
-    rack-protection (2.0.8.1)
-      rack
     rack-rewrite (1.5.1)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -308,7 +306,7 @@ GEM
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     rbtree3 (0.6.0)
-    redis (4.1.3)
+    redis (4.4.0)
     regexp_parser (1.6.0)
     responders (3.0.0)
       actionpack (>= 5.0)
@@ -354,11 +352,10 @@ GEM
     scenic (1.5.1)
       activerecord (>= 4.0.0)
       railties (>= 4.0.0)
-    sidekiq (6.0.4)
+    sidekiq (6.2.1)
       connection_pool (>= 2.2.2)
-      rack (>= 2.0.0)
-      rack-protection (>= 2.0.0)
-      redis (>= 4.1.0)
+      rack (~> 2.0)
+      redis (>= 4.2.0)
     sidekiq-cron (1.1.0)
       fugit (~> 1.1)
       sidekiq (>= 4.2.1)
@@ -446,7 +443,7 @@ DEPENDENCIES
   rspec-rails
   sassc-rails (~> 2.1.2)
   scenic (~> 1.5.1)
-  sidekiq (~> 6.0.3)
+  sidekiq (~> 6.2.1)
   sidekiq-cron (~> 1.1.0)
   simplecov
   simplecov-lcov