diff --git a/Gemfile b/Gemfile index 9547301..071f045 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'rails', '~> 5.2.2' # Use sqlite3 as the database for Active Record gem 'sqlite3' # 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 eb2c032..efbd5b0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -118,7 +118,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.1) mini_portile2 (2.4.0) minitest (5.11.3) @@ -148,7 +150,8 @@ GEM orm_adapter (0.5.0) popper_js (1.14.5) public_suffix (3.0.3) - puma (3.12.0) + puma (4.3.11) + nio4r (~> 2.0) rack (2.0.6) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -263,7 +266,7 @@ DEPENDENCIES jquery-rails listen (>= 3.0.5, < 3.2) omniauth-google-oauth2 (~> 0.6.0) - puma (~> 3.11) + puma (~> 4.3) rails (~> 5.2.2) sass-rails (~> 5.0) selenium-webdriver