diff --git a/Gemfile b/Gemfile index 131ea60..29f8615 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'rails', '~> 5.2.3' # Use postgresql as the database for Active Record gem 'pg', '>= 0.18', '< 2.0' # 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 48a87b7..3a7c3c0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -136,7 +136,9 @@ GEM marcel (0.3.3) mimemagic (~> 0.3.2) method_source (0.9.2) - 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) @@ -152,7 +154,8 @@ GEM activesupport (>= 4.2) popper_js (1.14.5) public_suffix (4.0.1) - puma (3.12.2) + puma (4.3.8) + nio4r (~> 2.0) rack (2.0.8) rack-pjax (1.1.0) nokogiri (~> 1.5) @@ -282,7 +285,7 @@ DEPENDENCIES mail_form pg (>= 0.18, < 2.0) pg_search - puma (~> 3.12) + puma (~> 4.3) rails (~> 5.2.3) rails_admin sass-rails (~> 5.0)