diff --git a/Gemfile b/Gemfile index dfb0e99..f58902c 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'rails', '~> 5.2.0' # 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 a5551f6..72e3614 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -98,7 +98,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) @@ -112,7 +114,8 @@ GEM coderay (~> 1.1.0) method_source (~> 0.9.0) public_suffix (3.0.2) - puma (3.11.4) + puma (4.3.12) + nio4r (~> 2.0) rack (2.0.5) rack-cors (1.0.2) rack-test (1.0.0) @@ -208,7 +211,7 @@ DEPENDENCIES listen (>= 3.0.5, < 3.2) pg (>= 0.18, < 2.0) pry (~> 0.12.2) - puma (~> 3.11) + puma (~> 4.3) rack-cors rails (~> 5.2.0) sass-rails (~> 5.0)