diff --git a/Gemfile b/Gemfile index 8e32a42..afe0cc1 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem 'rails', '~> 5.2.3' # 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 ae6bc80..20a71f3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -120,7 +120,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.11.3) @@ -156,7 +158,8 @@ GEM coderay (~> 1.1.0) method_source (~> 0.9.0) public_suffix (3.1.1) - puma (3.12.1) + puma (4.3.8) + nio4r (~> 2.0) rack (2.0.7) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -264,7 +267,7 @@ DEPENDENCIES omniauth-github omniauth-google-oauth2 pry - puma (~> 3.11) + puma (~> 4.3) rails (~> 5.2.3) sass-rails (~> 5.0) selenium-webdriver