diff --git a/Gemfile b/Gemfile index e9de05d..9d4f3d9 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'rails', '~> 5.2.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 47fdc3b..95b5d9f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -120,7 +120,9 @@ GEM marcel (0.3.2) mimemagic (~> 0.3.2) method_source (0.9.0) - mimemagic (0.3.2) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_mime (1.0.0) mini_portile2 (2.3.0) minitest (5.11.3) @@ -134,7 +136,8 @@ GEM activerecord (> 4.0.0) pg (1.0.0) popper_js (1.14.5) - puma (3.12.0) + puma (4.3.12) + nio4r (~> 2.0) rack (2.0.5) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -233,7 +236,7 @@ DEPENDENCIES listen (>= 3.0.5, < 3.2) petergate (~> 2.0, >= 2.0.1) pg (>= 0.18, < 2.0) - puma (~> 3.11) + puma (~> 4.3) rails (~> 5.2.1) sass-rails (~> 5.0) spring