diff --git a/Gemfile b/Gemfile index cd1d880..da85bf8 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'rails', '~> 5.2.4', '>= 5.2.4.1' # Use postgresql as the database for Active Record gem 'pg', '>= 0.18', '< 2.0' # Use Puma as the app server -gem 'puma', '~> 3.11' +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 210aee3..b97170b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -127,7 +127,9 @@ GEM marcel (0.3.3) mimemagic (~> 0.3.2) method_source (1.0.0) - mimemagic (0.3.4) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.14.0) @@ -139,7 +141,8 @@ GEM orm_adapter (0.5.0) pg (1.2.3) public_suffix (4.0.4) - puma (3.12.4) + puma (4.3.8) + nio4r (~> 2.0) rack (2.2.2) rack-pjax (1.1.0) nokogiri (~> 1.5) @@ -263,7 +266,7 @@ DEPENDENCIES jbuilder (~> 2.5) listen (>= 3.0.5, < 3.2) pg (>= 0.18, < 2.0) - puma (~> 3.11) + puma (~> 4.3) rails (~> 5.2.4, >= 5.2.4.1) rails_admin sass-rails (~> 5.0)