diff --git a/Gemfile b/Gemfile old mode 100755 new mode 100644 index 3f9cc2d..94ecf10 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'rails', '~> 6.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 old mode 100755 new mode 100644 index cf60c18..0488eee --- a/Gemfile.lock +++ b/Gemfile.lock @@ -139,7 +139,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.12.0) @@ -153,7 +155,8 @@ GEM pg (1.1.4) popper_js (1.14.5) public_suffix (4.0.1) - puma (3.12.1) + puma (4.3.11) + nio4r (~> 2.0) rack (2.0.7) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -290,7 +293,7 @@ DEPENDENCIES listen (>= 3.0.5, < 3.2) local_time pg (>= 0.18, < 2.0) - puma (~> 3.11) + puma (~> 4.3) rails (~> 6.0) sass-rails (~> 5.0) selenium-webdriver