diff --git a/Gemfile b/Gemfile index 4d36c1dc..725f45af 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'rails', '~> 6.0.1' # Use sqlite3 as the database for Active Record gem 'sqlite3', '~> 1.4' # Use Puma as the app server -gem 'puma', '~> 4.1' +gem 'puma', '~> 5.6' # Use SCSS for stylesheets gem 'sass-rails', '>= 6' # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker diff --git a/Gemfile.lock b/Gemfile.lock index 989727ed..41c411b1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -113,10 +113,10 @@ GEM activemodel (>= 3.2.13, < 6.1) activesupport (>= 3.2.13, < 6.1) google_business_api_url_signer (~> 0.1.3) + hashie (4.0.0) http-accept (1.7.0) http-cookie (1.0.3) domain_name (~> 0.5) - hashie (4.0.0) i18n (1.7.0) concurrent-ruby (~> 1.0) jbuilder (2.9.1) @@ -136,20 +136,22 @@ GEM mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2019.1009) - mimemagic (0.3.3) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.13.0) msgpack (1.3.1) - netrc (0.11.0) multi_json (1.14.1) multipart-post (2.1.1) - nio4r (2.5.2) + netrc (0.11.0) + nio4r (2.5.8) nokogiri (1.10.7) mini_portile2 (~> 2.4.0) pg (1.2.1) public_suffix (4.0.2) - puma (4.3.1) + puma (5.6.4) nio4r (~> 2.0) rack (2.0.8) rack-cors (1.1.1) @@ -259,15 +261,15 @@ DEPENDENCIES bootsnap (>= 1.4.2) byebug capybara (>= 2.15) - google_distance_matrix chewy elasticsearch-model! elasticsearch-rails! geocoder + google_distance_matrix jbuilder (~> 2.7) listen (>= 3.0.5, < 3.2) pg - puma (~> 4.1) + puma (~> 5.6) rack-cors rails (~> 6.0.1) rest-client