diff --git a/web/.gitignore b/web/.gitignore
index 990e443a0..4a6dbf446 100644
--- a/web/.gitignore
+++ b/web/.gitignore
@@ -55,3 +55,4 @@ yarn-debug.log*
 .ruby-version
 .rails5-gems
 .byebug_history
+.bundle/
diff --git a/web/Gemfile b/web/Gemfile
index dd36b63f3..2db64bc5b 100644
--- a/web/Gemfile
+++ b/web/Gemfile
@@ -24,10 +24,6 @@ if devenv
   gem 'jampb', :path => "../pb/target/ruby/jampb"
   gem 'jam_ruby', :path => "../ruby"
   gem 'jam_websockets', :path => "../websocket-gateway"
-
-  #gems that are not maintained/compitible with other gem upgrades and hence been maintained by jamkazam
-  gem 'react-rails', :path => "../gems/rails6.1/react-rails-1.3.3"
-  gem 'google-api-client', path: "../gems/rails6.1/google-api-client-0.7.1"
 else
   source 'https://jamjam:blueberryjam@int.jamkazam.com/gems/' do
     #gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}"
@@ -35,9 +31,6 @@ else
     gem 'jam_ruby',  "0.1.#{ENV["BUILD_NUMBER"]}"
     gem 'jam_websockets',  "0.1.#{ENV["BUILD_NUMBER"]}"
     ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
-    #gems that are hosted in jamkazam gem server
-    gem 'react-rails', '1.3.3'
-    gem 'google-api-client', '0.7.1'
   end
 end
 
@@ -112,7 +105,7 @@ gem 'omniauth-facebook'
 gem 'omniauth-twitter'
 gem 'omniauth-google-oauth2', '0.8.2' # this is held back becuase stripe-connect needs omnniauth 1.x
 gem 'omniauth-stripe-connect'
-#gem 'google-api-client' #, '0.7.1'
+gem 'google-api-client' #, '0.7.1'
 gem 'retriable', '3.0.1' # this is necessary because 3.0.2 has a bug when used by google-api-client
 #gem 'google-api-omniauth' #, '0.1.1'
 gem 'signet', '0.5.0'
@@ -167,7 +160,7 @@ gem 'influxdb', '>= 0.6.4'
 gem 'influxdb-rails', '1.0.0'
 gem 'sitemap_generator'
 gem 'bower-rails', "~> 0.9.2"
-#gem 'react-rails', '1.3.3' #'1.0.0' #'1.6.2' #'1.7.0' #'1.8.0' # , '1.3.3' #'~> 1.0'
+gem 'react-rails', '1.3.3' #'1.0.0' #'1.6.2' #'1.7.0' #'1.8.0' # , '1.3.3' #'~> 1.0'
 gem 'sendgrid_toolkit', '>= 1.1.1'
 gem 'stripe'
 gem 'zip-codes'
diff --git a/web/Gemfile.lock b/web/Gemfile.lock
index 6b45290fb..56cf803ce 100644
--- a/web/Gemfile.lock
+++ b/web/Gemfile.lock
@@ -1,13 +1,3 @@
-PATH
-  remote: ../gems/rails6.1/google-api-client-0.7.1
-  specs:
-    google-api-client (1)
-
-PATH
-  remote: ../gems/rails6.1/react-rails-1.3.3
-  specs:
-    react-rails (1.3.3)
-
 PATH
   remote: ../pb/target/ruby/jampb
   specs:
@@ -101,6 +91,10 @@ GEM
     arr-pm (0.0.12)
     auto_strip_attributes (2.6.0)
       activerecord (>= 4.0)
+    autoparse (0.3.3)
+      addressable (>= 2.3.1)
+      extlib (>= 0.9.15)
+      multi_json (>= 1.0.0)
     aws-sdk (1.67.0)
       aws-sdk-v1 (= 1.67.0)
     aws-sdk-v1 (1.67.0)
@@ -158,6 +152,7 @@ GEM
       execjs
     coffee-script-source (1.12.2)
     concurrent-ruby (1.1.10)
+    connection_pool (2.3.0)
     crack (0.4.5)
       rexml
     crass (1.0.6)
@@ -198,6 +193,7 @@ GEM
     eventmachine (1.2.3)
     excon (0.94.0)
     execjs (2.6.0)
+    extlib (0.9.16)
     factory_girl (4.9.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.9.0)
@@ -297,6 +293,17 @@ GEM
     gon (4.1.1)
       actionpack (>= 2.3.0)
       json
+    google-api-client (0.7.1)
+      addressable (>= 2.3.2)
+      autoparse (>= 0.3.3)
+      extlib (>= 0.9.15)
+      faraday (>= 0.9.0)
+      jwt (>= 0.1.5)
+      launchy (>= 2.1.1)
+      multi_json (>= 1.0.0)
+      retriable (>= 1.4)
+      signet (>= 0.5.0)
+      uuidtools (>= 2.1.0)
     haml (6.0.12)
       temple (>= 0.8.2)
       thor
@@ -523,6 +530,13 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rchardet (1.8.0)
+    react-rails (1.3.3)
+      babel-transpiler (>= 0.7.0)
+      coffee-script-source (~> 1.8)
+      connection_pool
+      execjs
+      rails (>= 3.2)
+      tilt
     recurly (2.18.16)
     redis (3.3.5)
     redis-namespace (1.8.2)
@@ -761,7 +775,7 @@ DEPENDENCIES
   geokit-rails
   god
   gon (~> 4.1.0)
-  google-api-client!
+  google-api-client
   haml-rails
   htmlentities
   icalendar
@@ -809,7 +823,7 @@ DEPENDENCIES
   rails-assets-regenerator!
   rails-controller-testing
   rails-observers
-  react-rails!
+  react-rails (= 1.3.3)
   recurly (= 2.18.16)
   redis
   redis-namespace
diff --git a/websocket-gateway/.ruby-version b/websocket-gateway/.ruby-version
index 005119baa..24ba9a38d 100644
--- a/websocket-gateway/.ruby-version
+++ b/websocket-gateway/.ruby-version
@@ -1 +1 @@
-2.4.1
+2.7.0
diff --git a/websocket-gateway/Gemfile b/websocket-gateway/Gemfile
index 2bd96dc15..77fc6cfd7 100644
--- a/websocket-gateway/Gemfile
+++ b/websocket-gateway/Gemfile
@@ -4,9 +4,9 @@ unless ENV['LOCAL_DEV'] == '1'
   source 'https://jamjam:blueberryjam@int.jamkazam.com/gems/'
 end
 
-ruby_version = ENV["JAM_RUBY_VERSION"]
-ruby_version = "2.3.1" if ruby_version.nil?
-
+# ruby_version = ENV["JAM_RUBY_VERSION"]
+# ruby_version = "2.3.1" if ruby_version.nil?
+ruby_version = "2.7.0"
 ruby ruby_version
 
 # Look for $WORKSPACE, otherwise use "workspace" as dev path.
@@ -22,9 +22,9 @@ else
   ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
 end
 
-gem 'activerecord', '= 4.2.8'
-gem 'actionpack', '= 4.2.8'
-gem 'actionmailer', '= 4.2.8'
+gem 'activerecord', '= 6.1.0'
+gem 'actionpack', '= 6.1.0'
+gem 'actionmailer', '= 6.1.0'
 #gem 'protected_attributes'
 gem 'protected_attributes_continued'
 gem 'rails-observers'
@@ -33,17 +33,17 @@ gem 'auto_strip_attributes', '2.6.0'
 # PINNED TO SUPPORT BOTH 2.3.1 and 2.4.1 Ruby simultaneously
 # This should be the same in ruby/admin/web/websocket-gateway
 #######
-gem 'nokogiri', '1.10.10' # added to pin before 1.11.0, which requires at leaost ruby 2.5.  unpin we go above
-gem 'sprockets', '3.6.3' # added to pin before 4.0.0, which requiurse at least ruby 2.5
-gem 'fog-brightbox', '0.11.0' # pinned until we are on ruby 2.5; then remove
-gem 'faraday', '0.9.2' # pinned untnil we are on ruby 2.5; then remove
-gem 'ruby-prof', '0.15.9' # pinned until we are on ruby 2.5; then remove
-gem 'rubyzip', '1.2.1'  # pinned until we are on ruby 2.5; then remove
+gem 'nokogiri'#, '1.10.10' # added to pin before 1.11.0, which requires at leaost ruby 2.5.  unpin we go above
+gem 'sprockets'#, '3.6.3' # added to pin before 4.0.0, which requiurse at least ruby 2.5
+gem 'fog-brightbox'#, '0.11.0' # pinned until we are on ruby 2.5; then remove
+#gem 'faraday'#, '0.9.2' # pinned untnil we are on ruby 2.5; then remove
+gem 'ruby-prof'#, '0.15.9' # pinned until we are on ruby 2.5; then remove
+gem 'rubyzip'#, '1.2.1'  # pinned until we are on ruby 2.5; then remove
 gem 'recurly', '2.18.16' # should upgrade to 3.x when we have time to validaate
-gem 'icalendar', '2.4.0' # pinned until we are on ruby 2.5; then remove
-gem 'email_validator', '1.6.0' # pinned until we are on ruby 2.5, then remove
-gem 'redis', '3.3.3' # pinned until we are on 2.5; then remove
-gem 'redis-namespace', '1.5.3' # pinned until we are on 2.5; then remove
+gem 'icalendar'#, '2.4.0' # pinned until we are on ruby 2.5; then remove
+gem 'email_validator'#, '1.6.0' # pinned until we are on ruby 2.5, then remove
+gem 'redis'#, '3.3.3' # pinned until we are on 2.5; then remove
+gem 'redis-namespace'#, '1.5.3' # pinned until we are on 2.5; then remove
 gem 'oj', '3.1.3' # pinned until we are on 2.5; then remove
 gem 'bcrypt', '3.1.13'
 gem 'mimemagic', :source => 'https://int.jamkazam.com/gems/'
@@ -53,6 +53,7 @@ gem 'mimemagic', :source => 'https://int.jamkazam.com/gems/'
 #gem 'license_finder'
 gem 'zip-codes'
 gem 'stripe'
+gem 'faraday', '0.8.8'
 gem 'kickbox'
 gem 'uuidtools', '2.1.2'
 # On MacOSX: gem install bcrypt-ruby -v '3.0.1' -- --with-cflags=-Wno-implicit-function-declaration
@@ -66,19 +67,19 @@ gem 'rb-readline'
 gem 'aasm' #, '3.0.16'
 gem 'carrierwave', '0.11.2'
 gem 'fog'
-gem 'devise', '3.3.0' # 3.4.0 causes uninitialized constant ActionController::Metal (NameError)
+gem 'devise'#, '3.3.0' # 3.4.0 causes uninitialized constant ActionController::Metal (NameError)
 gem 'postgres-copy'
 gem 'aws-sdk', '~> 1'
 gem 'bugsnag', '5.3.2'
-gem 'postgres_ext'
+#gem 'postgres_ext'
 gem 'resque'
 gem 'resque-retry'
 gem 'resque-failed-job-mailer'
 gem 'resque-lonely_job', '~> 1.0.0'
 gem 'resque_mailer'
 gem 'geokit'
-gem 'geokit-rails', '2.3.2' #, '2.0.1'
-gem 'mime-types', '1.25.1'
+gem 'geokit-rails'#, '2.3.2' #, '2.0.1'
+gem 'mime-types'#, '1.25.1'
 gem 'rest-client'
 gem 'netaddr', '1.5.1'
 gem 'iso-639'
@@ -88,40 +89,42 @@ gem 'sanitize'
 gem 'cause' # needed by influxdb
 gem 'sendgrid_toolkit', '>= 1.1.1'
 gem 'elasticsearch'
+gem 'json', '1.8.6'
 
-if ENV["MODERN_OS"] == "1"
-  gem 'pg', '0.21.0'
-else
-  gem 'pg', '0.17.1'
-end
+# if ENV["MODERN_OS"] == "1"
+#   gem 'pg', '0.21.0'
+# else
+#   gem 'pg', '0.17.1'
+# end
+gem 'pg'
 
 group :development do
 	gem 'pry'
 end
 
 group :test do
-    gem 'simplecov', '~> 0.7.1'
-    gem 'simplecov-rcov'
-    gem 'cucumber'
-    gem 'rspec', '2.14.1' # can go to 3.0, but requires changes to tests due to should removal, be_truthy, and other changes
-    gem 'factory_girl'
-    #gem 'spork', '0.9.0'
+  gem 'simplecov', '~> 0.7.1'
+  gem 'simplecov-rcov'
+  gem 'cucumber'
+  gem 'rspec', '2.14.1' # can go to 3.0, but requires changes to tests due to should removal, be_truthy, and other changes
+  gem 'factory_girl'
+  #gem 'spork', '0.9.0'
 #<<<<<<< HEAD
-    gem 'database_cleaner' #, '0.7.0'
+  gem 'database_cleaner' #, '0.7.0'
 #    gem 'guard', '>= 0.10.0'
 #    gem 'guard-rspec', '>= 0.7.3'
 #    gem 'pg_migrate','0.1.13' #:path => "#{workspace}/pg_migrate_ruby"
 #=======
 #    gem 'database_cleaner', '0.7.0'
-    #gem 'pg_migrate','0.1.14' #:path => "#{workspace}/pg_migrate_ruby"
+  #gem 'pg_migrate','0.1.14' #:path => "#{workspace}/pg_migrate_ruby"
 #>>>>>>> develop
-    gem 'evented-spec'
+  gem 'evented-spec'
 end
 
 group :production do
-    gem 'newrelic_rpm'
+  gem 'newrelic_rpm'
 end
 
 group :package do
-    gem 'fpm'
-end
+  gem 'fpm'
+end
\ No newline at end of file
diff --git a/websocket-gateway/Gemfile.lock b/websocket-gateway/Gemfile.lock
index bf6e68bcc..0d55603f3 100644
--- a/websocket-gateway/Gemfile.lock
+++ b/websocket-gateway/Gemfile.lock
@@ -13,53 +13,71 @@ GEM
   remote: https://jamjam:blueberryjam@int.jamkazam.com/gems/
   remote: https://int.jamkazam.com/gems/
   specs:
-    CFPropertyList (2.3.6)
     aasm (5.4.0)
       concurrent-ruby (~> 1.0)
-    actionmailer (4.2.8)
-      actionpack (= 4.2.8)
-      actionview (= 4.2.8)
-      activejob (= 4.2.8)
+    actioncable (6.1.0)
+      actionpack (= 6.1.0)
+      activesupport (= 6.1.0)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.1.0)
+      actionpack (= 6.1.0)
+      activejob (= 6.1.0)
+      activerecord (= 6.1.0)
+      activestorage (= 6.1.0)
+      activesupport (= 6.1.0)
+      mail (>= 2.7.1)
+    actionmailer (6.1.0)
+      actionpack (= 6.1.0)
+      actionview (= 6.1.0)
+      activejob (= 6.1.0)
+      activesupport (= 6.1.0)
       mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.8)
-      actionview (= 4.2.8)
-      activesupport (= 4.2.8)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.8)
-      activesupport (= 4.2.8)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.1.0)
+      actionview (= 6.1.0)
+      activesupport (= 6.1.0)
+      rack (~> 2.0, >= 2.0.9)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.1.0)
+      actionpack (= 6.1.0)
+      activerecord (= 6.1.0)
+      activestorage (= 6.1.0)
+      activesupport (= 6.1.0)
+      nokogiri (>= 1.8.5)
+    actionview (6.1.0)
+      activesupport (= 6.1.0)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.8)
-      activesupport (= 4.2.8)
-      globalid (>= 0.3.0)
-    activemodel (4.2.8)
-      activesupport (= 4.2.8)
-      builder (~> 3.1)
-    activerecord (4.2.8)
-      activemodel (= 4.2.8)
-      activesupport (= 4.2.8)
-      arel (~> 6.0)
-    activesupport (4.2.8)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
-    aliyun-sdk (0.8.0)
-      nokogiri (~> 1.6)
-      rest-client (~> 2.0)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.1.0)
+      activesupport (= 6.1.0)
+      globalid (>= 0.3.6)
+    activemodel (6.1.0)
+      activesupport (= 6.1.0)
+    activerecord (6.1.0)
+      activemodel (= 6.1.0)
+      activesupport (= 6.1.0)
+    activestorage (6.1.0)
+      actionpack (= 6.1.0)
+      activejob (= 6.1.0)
+      activerecord (= 6.1.0)
+      activesupport (= 6.1.0)
+      marcel (~> 0.3.1)
+      mimemagic (~> 0.3.2)
+    activesupport (6.1.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     amq-protocol (2.3.2)
     amqp (1.8.0)
       amq-protocol (>= 2.2.0)
       eventmachine
-    arel (6.0.4)
     arr-pm (0.0.12)
     auto_strip_attributes (2.6.0)
       activerecord (>= 4.0)
@@ -83,224 +101,96 @@ GEM
     clamp (1.0.1)
     coderay (1.1.3)
     concurrent-ruby (1.1.10)
+    connection_pool (2.3.0)
     crass (1.0.6)
-    cucumber (4.1.0)
-      builder (~> 3.2, >= 3.2.3)
-      cucumber-core (~> 7.1, >= 7.1.0)
-      cucumber-create-meta (~> 1.0.0, >= 1.0.0)
-      cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
-      cucumber-gherkin (~> 14.0, >= 14.0.1)
-      cucumber-html-formatter (~> 7.0, >= 7.0.0)
-      cucumber-messages (~> 12.2, >= 12.2.0)
-      cucumber-wire (~> 3.1, >= 3.1.0)
-      diff-lcs (~> 1.3, >= 1.3, < 1.4)
-      multi_test (~> 0.1, >= 0.1.2)
-      sys-uname (~> 1.0, >= 1.0.2)
-    cucumber-core (7.1.0)
-      cucumber-gherkin (~> 14.0, >= 14.0.1)
-      cucumber-messages (~> 12.2, >= 12.2.0)
-      cucumber-tag-expressions (~> 2.0, >= 2.0.4)
-    cucumber-create-meta (1.0.0)
-      cucumber-messages (~> 12.2, >= 12.2.0)
-      sys-uname (~> 1.2, >= 1.2.1)
-    cucumber-cucumber-expressions (10.3.0)
-    cucumber-gherkin (14.2.0)
-      cucumber-messages (~> 12.4, >= 12.4.0)
-    cucumber-html-formatter (7.2.0)
-      cucumber-messages (~> 12.4, >= 12.4.0)
-    cucumber-messages (12.4.0)
-      protobuf-cucumber (~> 3.10, >= 3.10.8)
-    cucumber-tag-expressions (2.0.4)
-    cucumber-wire (3.1.0)
-      cucumber-core (~> 7.1, >= 7.1.0)
-      cucumber-cucumber-expressions (~> 10.1, >= 10.1.0)
-      cucumber-messages (~> 12.2, >= 12.2.0)
-    database_cleaner (1.99.0)
-    devise (3.3.0)
+    cucumber (8.0.0)
+      builder (~> 3.2, >= 3.2.4)
+      cucumber-ci-environment (~> 9.0, >= 9.0.4)
+      cucumber-core (~> 11.0, >= 11.0.0)
+      cucumber-cucumber-expressions (~> 15.1, >= 15.1.1)
+      cucumber-gherkin (~> 23.0, >= 23.0.1)
+      cucumber-html-formatter (~> 19.1, >= 19.1.0)
+      cucumber-messages (~> 18.0, >= 18.0.0)
+      diff-lcs (~> 1.5, >= 1.5.0)
+      mime-types (~> 3.4, >= 3.4.1)
+      multi_test (~> 1.1, >= 1.1.0)
+      sys-uname (~> 1.2, >= 1.2.2)
+    cucumber-ci-environment (9.1.0)
+    cucumber-core (11.0.0)
+      cucumber-gherkin (~> 23.0, >= 23.0.1)
+      cucumber-messages (~> 18.0, >= 18.0.0)
+      cucumber-tag-expressions (~> 4.1, >= 4.1.0)
+    cucumber-cucumber-expressions (15.2.0)
+    cucumber-gherkin (23.0.1)
+      cucumber-messages (~> 18.0, >= 18.0.0)
+    cucumber-html-formatter (19.2.0)
+      cucumber-messages (~> 18.0, >= 18.0.0)
+    cucumber-messages (18.0.0)
+    cucumber-tag-expressions (4.1.0)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.1)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    date (3.3.3)
+    devise (4.8.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 3.2.6, < 5)
-      thread_safe (~> 0.1)
+      railties (>= 4.1.0)
+      responders
       warden (~> 1.2.3)
-    diff-lcs (1.3)
+    diff-lcs (1.5.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     dotenv (2.8.1)
-    elasticsearch (7.4.0)
-      elasticsearch-api (= 7.4.0)
-      elasticsearch-transport (= 7.4.0)
-    elasticsearch-api (7.4.0)
+    dry-inflector (1.0.0)
+    elastic-transport (8.1.0)
+      faraday (< 3)
       multi_json
-    elasticsearch-transport (7.4.0)
-      faraday
+    elasticsearch (8.5.2)
+      elastic-transport (~> 8)
+      elasticsearch-api (= 8.5.2)
+    elasticsearch-api (8.5.2)
       multi_json
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
-    email_validator (1.6.0)
+    email_validator (2.2.4)
       activemodel
-    erubis (2.7.0)
+    erubi (1.12.0)
     et-orbi (1.2.7)
       tzinfo
     evented-spec (0.9.0)
     eventmachine (1.2.7)
-    excon (0.94.0)
+    excon (0.95.0)
     factory_girl (4.9.0)
       activesupport (>= 3.0.0)
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
     ffi (1.15.5)
-    fission (0.5.0)
-      CFPropertyList (~> 2.2)
-    fog (1.41.0)
-      fog-aliyun (>= 0.1.0)
-      fog-atmos
-      fog-aws (>= 0.6.0)
-      fog-brightbox (~> 0.4)
-      fog-cloudatcost (~> 0.1.0)
-      fog-core (~> 1.45)
-      fog-digitalocean (>= 0.3.0)
-      fog-dnsimple (~> 1.0)
-      fog-dynect (~> 0.0.2)
-      fog-ecloud (~> 0.1)
-      fog-google (<= 0.1.0)
-      fog-internet-archive
-      fog-joyent
-      fog-json
-      fog-local
-      fog-openstack
-      fog-powerdns (>= 0.1.1)
-      fog-profitbricks
-      fog-rackspace
-      fog-radosgw (>= 0.0.2)
-      fog-riakcs
-      fog-sakuracloud (>= 0.0.4)
-      fog-serverlove
-      fog-softlayer
-      fog-storm_on_demand
-      fog-terremark
-      fog-vmfusion
-      fog-voxel
-      fog-vsphere (>= 0.4.0)
-      fog-xenserver
-      fog-xml (~> 0.1.1)
-      ipaddress (~> 0.5)
-      json (>= 1.8, < 2.0)
-    fog-aliyun (0.4.0)
-      addressable (~> 2.8.0)
-      aliyun-sdk (~> 0.8.0)
-      fog-core
-      fog-json
-      ipaddress (~> 0.8)
-      xml-simple (~> 1.1)
-    fog-atmos (0.1.0)
-      fog-core
-      fog-xml
-    fog-aws (2.0.1)
-      fog-core (~> 1.38)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
-      ipaddress (~> 0.8)
-    fog-brightbox (0.11.0)
-      fog-core (~> 1.22)
-      fog-json
-      inflecto (~> 0.0.2)
-    fog-cloudatcost (0.1.2)
-      fog-core (~> 1.36)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
-      ipaddress (~> 0.8)
-    fog-core (1.45.0)
+    fog (0.7.2)
       builder
-      excon (~> 0.58)
-      formatador (~> 0.2)
-    fog-digitalocean (0.4.0)
-      fog-core
+      excon (>= 0.6.1)
+      formatador (>= 0.1.3)
+      json
+      mime-types
+      net-ssh (>= 2.1.3)
+      nokogiri (>= 1.4.4)
+      ruby-hmac
+    fog-brightbox (1.8.2)
+      dry-inflector
+      fog-core (>= 1.45, < 3.0)
       fog-json
-      fog-xml
-      ipaddress (>= 0.5)
-    fog-dnsimple (1.0.0)
-      fog-core (~> 1.38)
-      fog-json (~> 1.0)
-    fog-dynect (0.0.3)
-      fog-core
-      fog-json
-      fog-xml
-    fog-ecloud (0.3.0)
-      fog-core
-      fog-xml
-    fog-google (0.1.0)
-      fog-core
-      fog-json
-      fog-xml
-    fog-internet-archive (0.0.2)
-      fog-core
-      fog-json
-      fog-xml
-    fog-joyent (0.0.1)
-      fog-core (~> 1.42)
-      fog-json (>= 1.0)
+    fog-core (2.3.0)
+      builder
+      excon (~> 0.71)
+      formatador (>= 0.2, < 2.0)
+      mime-types
     fog-json (1.2.0)
       fog-core
       multi_json (~> 1.10)
-    fog-local (0.8.0)
-      fog-core (>= 1.27, < 3.0)
-    fog-openstack (0.3.10)
-      fog-core (>= 1.45, <= 2.1.0)
-      fog-json (>= 1.0)
-      ipaddress (>= 0.8)
-    fog-powerdns (0.2.0)
-      fog-core
-      fog-json
-      fog-xml
-    fog-profitbricks (4.1.1)
-      fog-core (~> 1.42)
-      fog-json (~> 1.0)
-    fog-rackspace (0.1.6)
-      fog-core (>= 1.35)
-      fog-json (>= 1.0)
-      fog-xml (>= 0.1)
-      ipaddress (>= 0.8)
-    fog-radosgw (0.0.5)
-      fog-core (>= 1.21.0)
-      fog-json
-      fog-xml (>= 0.0.1)
-    fog-riakcs (0.1.0)
-      fog-core
-      fog-json
-      fog-xml
-    fog-sakuracloud (1.7.5)
-      fog-core
-      fog-json
-    fog-serverlove (0.1.2)
-      fog-core
-      fog-json
-    fog-softlayer (1.1.4)
-      fog-core
-      fog-json
-    fog-storm_on_demand (0.1.1)
-      fog-core
-      fog-json
-    fog-terremark (0.1.0)
-      fog-core
-      fog-xml
-    fog-vmfusion (0.1.0)
-      fission
-      fog-core
-    fog-voxel (0.1.0)
-      fog-core
-      fog-xml
-    fog-vsphere (3.5.2)
-      fog-core
-      rbvmomi (>= 1.9, < 3)
-    fog-xenserver (1.0.0)
-      fog-core
-      fog-xml
-      xmlrpc
-    fog-xml (0.1.4)
-      fog-core
-      nokogiri (>= 1.5.11, < 2.0.0)
-    formatador (0.3.0)
+    formatador (1.1.0)
     fpm (1.15.0)
       arr-pm (~> 0.0.11)
       backports (>= 2.6.2)
@@ -309,67 +199,86 @@ GEM
       pleaserun (~> 0.0.29)
       rexml
       stud
-    fugit (1.7.2)
+    fugit (1.8.0)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
     geokit (1.13.1)
     geokit-rails (2.3.2)
       geokit (~> 1.5)
       rails (>= 3.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
     http-accept (1.7.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     http_parser.rb (0.8.0)
-    httparty (0.16.2)
+    httparty (0.21.0)
+      mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (0.9.5)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    icalendar (2.4.0)
-    inflecto (0.0.2)
+    icalendar (2.8.0)
+      ice_cube (~> 0.16)
+    ice_cube (0.16.4)
     insist (1.0.0)
-    ipaddress (0.8.3)
-    iso-639 (0.3.5)
+    iso-639 (0.3.6)
     json (1.8.6)
-    kickbox (2.0.4)
-      faraday (~> 0.9)
-      json (>= 1.8)
+    kickbox (2.0.0)
+      faraday (~> 0.8.8)
+      json (>= 1.7.7)
     language_list (1.2.1)
     little-plugger (1.1.4)
     logging (2.3.1)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
-    loofah (2.19.0)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.1)
+    mail (2.8.0)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
     method_source (1.0.0)
-    middleware (0.1.0)
-    mime-types (1.25.1)
-    mimemagic (0.3.5)
+    mime-types (3.4.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2022.0105)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
     mini_mime (1.1.2)
-    mini_portile2 (2.4.0)
-    minitest (5.15.0)
+    mini_portile2 (2.8.1)
+    minitest (5.16.3)
     mono_logger (1.1.1)
     multi_json (1.15.0)
-    multi_test (0.1.2)
+    multi_test (1.1.0)
     multi_xml (0.6.0)
-    multipart-post (2.2.3)
+    multipart-post (1.2.0)
     mustache (0.99.8)
+    mustermann (3.0.0)
+      ruby2_keywords (~> 0.0.1)
+    net-imap (0.3.4)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
+    net-ssh (7.0.1)
     netaddr (1.5.1)
     netrc (0.11.0)
-    newrelic_rpm (8.13.0)
-    nokogiri (1.10.10)
-      mini_portile2 (~> 2.4.0)
-    nokogumbo (2.0.5)
-      nokogiri (~> 1.8, >= 1.8.4)
+    newrelic_rpm (8.14.0)
+    nio4r (2.5.8)
+    nokogiri (1.13.10)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
     oj (3.1.3)
-    optimist (3.0.1)
     orm_adapter (0.5.0)
-    pg (0.21.0)
-    pg_array_parser (0.0.9)
+    pg (1.4.5)
     pleaserun (0.0.32)
       cabin (> 0)
       clamp
@@ -377,77 +286,66 @@ GEM
       insist
       mustache (= 0.99.8)
       stud
-    postgres-copy (1.2.0)
-      activerecord (>= 4.0, < 5.1)
+    postgres-copy (1.7.0)
+      activerecord (>= 5.1)
       pg (>= 0.17)
-      responders
-    postgres_ext (3.0.1)
-      activerecord (~> 4.0)
-      arel (>= 4.0.1)
-      pg_array_parser (~> 0.0.9)
-    protected_attributes_continued (1.2.4)
-      activemodel (>= 4.0.1, < 6.0)
-    protobuf-cucumber (3.10.8)
-      activesupport (>= 3.2)
-      middleware
-      thor
-      thread_safe
+    protected_attributes_continued (1.8.2)
+      activemodel (>= 5.0)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    public_suffix (4.0.7)
     raabro (1.4.0)
-    rack (1.6.13)
-    rack-protection (1.5.5)
+    racc (1.6.2)
+    rack (2.2.4)
+    rack-protection (3.0.5)
       rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.8)
-      actionmailer (= 4.2.8)
-      actionpack (= 4.2.8)
-      actionview (= 4.2.8)
-      activejob (= 4.2.8)
-      activemodel (= 4.2.8)
-      activerecord (= 4.2.8)
-      activesupport (= 4.2.8)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.8)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.4)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.9)
-      activesupport (>= 4.2.0, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rails (6.1.0)
+      actioncable (= 6.1.0)
+      actionmailbox (= 6.1.0)
+      actionmailer (= 6.1.0)
+      actionpack (= 6.1.0)
+      actiontext (= 6.1.0)
+      actionview (= 6.1.0)
+      activejob (= 6.1.0)
+      activemodel (= 6.1.0)
+      activerecord (= 6.1.0)
+      activestorage (= 6.1.0)
+      activesupport (= 6.1.0)
+      bundler (>= 1.15.0)
+      railties (= 6.1.0)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (4.2.8)
-      actionpack (= 4.2.8)
-      activesupport (= 4.2.8)
+    railties (6.1.0)
+      actionpack (= 6.1.0)
+      activesupport (= 6.1.0)
+      method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
+      thor (~> 1.0)
     rake (13.0.6)
     rb-readline (0.5.5)
-    rbvmomi (2.4.1)
-      builder (~> 3.0)
-      json (>= 1.8)
-      nokogiri (~> 1.5)
-      optimist (~> 3.0)
     recurly (2.18.16)
-    redis (3.3.3)
-    redis-namespace (1.5.3)
-      redis (~> 3.0, >= 3.0.4)
-    responders (2.4.1)
-      actionpack (>= 4.2.0, < 6.0)
-      railties (>= 4.2.0, < 6.0)
-    resque (1.27.4)
+    redis (5.0.5)
+      redis-client (>= 0.9.0)
+    redis-client (0.11.2)
+      connection_pool
+    redis-namespace (1.10.0)
+      redis (>= 4)
+    responders (3.0.1)
+      actionpack (>= 5.0)
+      railties (>= 5.0)
+    resque (2.4.0)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
-      redis-namespace (~> 1.3)
+      redis-namespace (~> 1.6)
       sinatra (>= 0.9.2)
-      vegas (~> 0.1.2)
     resque-failed-job-mailer (0.0.3)
     resque-lonely_job (1.0.2)
       resque (>= 1.2)
@@ -476,15 +374,16 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    ruby-prof (0.15.9)
+    ruby-hmac (0.4.0)
+    ruby-prof (1.4.5)
     ruby-protocol-buffers (1.2.2)
-    rubyzip (1.2.1)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
     rufus-scheduler (3.8.2)
       fugit (~> 1.1, >= 1.1.6)
-    sanitize (5.2.3)
+    sanitize (6.0.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.8.0)
-      nokogumbo (~> 2.0)
+      nokogiri (>= 1.12.0)
     sendgrid (1.2.4)
       json
     sendgrid_toolkit (1.4.0)
@@ -495,40 +394,38 @@ GEM
     simplecov-html (0.7.1)
     simplecov-rcov (0.3.1)
       simplecov (>= 0.4.1)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    sprockets (3.6.3)
+    sinatra (3.0.5)
+      mustermann (~> 3.0)
+      rack (~> 2.2, >= 2.2.4)
+      rack-protection (= 3.0.5)
+      tilt (~> 2.0)
+    sprockets (4.2.0)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+      rack (>= 2.2.4, < 4)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     stripe (8.0.0)
     stud (0.0.23)
     sys-uname (1.2.2)
       ffi (~> 1.1)
     thor (1.2.1)
-    thread_safe (0.3.6)
     tilt (2.0.11)
-    tzinfo (1.2.10)
-      thread_safe (~> 0.1)
+    timeout (0.3.1)
+    tzinfo (2.0.5)
+      concurrent-ruby (~> 1.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
     uuidtools (2.1.2)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
-    warden (1.2.7)
-      rack (>= 1.0)
-    webrick (1.7.0)
+    warden (1.2.9)
+      rack (>= 2.0.9)
+    websocket-driver (0.7.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
     will_paginate (3.3.1)
-    xml-simple (1.1.9)
-      rexml
-    xmlrpc (0.3.2)
-      webrick
+    zeitwerk (2.6.6)
     zip-codes (0.2.1)
 
 PLATFORMS
@@ -536,9 +433,9 @@ PLATFORMS
 
 DEPENDENCIES
   aasm
-  actionmailer (= 4.2.8)
-  actionpack (= 4.2.8)
-  activerecord (= 4.2.8)
+  actionmailer (= 6.1.0)
+  actionpack (= 6.1.0)
+  activerecord (= 6.1.0)
   amqp
   auto_strip_attributes (= 2.6.0)
   aws-sdk (~> 1)
@@ -548,41 +445,41 @@ DEPENDENCIES
   cause
   cucumber
   database_cleaner
-  devise (= 3.3.0)
+  devise
   elasticsearch
   em-websocket (>= 0.4.0)
-  email_validator (= 1.6.0)
+  email_validator
   evented-spec
   factory_girl
-  faraday (= 0.9.2)
+  faraday (= 0.8.8)
   fog
-  fog-brightbox (= 0.11.0)
+  fog-brightbox
   fpm
   geokit
-  geokit-rails (= 2.3.2)
-  icalendar (= 2.4.0)
+  geokit-rails
+  icalendar
   iso-639
   jam_ruby!
   jampb!
+  json (= 1.8.6)
   kickbox
   language_list
   logging
-  mime-types (= 1.25.1)
+  mime-types
   mimemagic!
   netaddr (= 1.5.1)
   newrelic_rpm
-  nokogiri (= 1.10.10)
+  nokogiri
   oj (= 3.1.3)
-  pg (= 0.21.0)
+  pg
   postgres-copy
-  postgres_ext
   protected_attributes_continued
   pry
   rails-observers
   rb-readline
   recurly (= 2.18.16)
-  redis (= 3.3.3)
-  redis-namespace (= 1.5.3)
+  redis
+  redis-namespace
   resque
   resque-failed-job-mailer
   resque-lonely_job (~> 1.0.0)
@@ -590,22 +487,22 @@ DEPENDENCIES
   resque_mailer
   rest-client
   rspec (= 2.14.1)
-  ruby-prof (= 0.15.9)
+  ruby-prof
   ruby-protocol-buffers (= 1.2.2)
-  rubyzip (= 1.2.1)
+  rubyzip
   sanitize
   sendgrid
   sendgrid_toolkit (>= 1.1.1)
   simplecov (~> 0.7.1)
   simplecov-rcov
-  sprockets (= 3.6.3)
+  sprockets
   stripe
   uuidtools (= 2.1.2)
   will_paginate
   zip-codes
 
 RUBY VERSION
-   ruby 2.4.1p111
+   ruby 2.7.0p0
 
 BUNDLED WITH
-   1.17.3
+   2.1.2