diff --git a/Gemfile b/Gemfile index ec4b64c..1b5aa0c 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ ruby '2.5.3' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.2.1' # Use Puma as the app server -gem 'puma', '~> 3.12' +gem 'puma', '~> 4.3' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets diff --git a/Gemfile.lock b/Gemfile.lock index 62acf76..c767b5b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -206,7 +206,9 @@ GEM mime-types (3.2.2) mime-types-data (~> 3.2015) mime-types-data (3.2018.0812) - mimemagic (0.3.2) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_mime (1.0.1) mini_portile2 (2.4.0) minitest (5.14.0) @@ -240,7 +242,8 @@ GEM pry (>= 0.10.4) psych (3.0.3) public_suffix (3.0.3) - puma (3.12.6) + puma (4.3.11) + nio4r (~> 2.0) rack (2.2.3) rack-cors (1.0.5) rack (>= 1.6.0) @@ -405,7 +408,7 @@ DEPENDENCIES pg (>= 0.20.0) pry-byebug pry-rails - puma (~> 3.12) + puma (~> 4.3) rack-cors (>= 1.0.2) rails (~> 5.2.1) rails-controller-testing