diff --git a/Gemfile b/Gemfile index 1b156f2..631933c 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,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 c6ef3b7..3ecf9fd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -125,7 +125,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) @@ -135,7 +137,8 @@ GEM mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) public_suffix (3.1.1) - puma (3.12.1) + puma (4.3.9) + nio4r (~> 2.0) rack (2.0.7) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -152,6 +155,10 @@ GEM bundler (>= 1.3.0) railties (= 5.2.3) sprockets-rails (>= 2.0.0) + rails-controller-testing (1.0.5) + actionpack (>= 5.0.1.rc1) + actionview (>= 5.0.1.rc1) + activesupport (>= 5.0.1.rc1) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) @@ -265,8 +272,9 @@ DEPENDENCIES immigrant jbuilder (~> 2.5) listen (>= 3.0.5, < 3.2) - puma (~> 3.11) + puma (~> 4.3) rails (~> 5.2.3) + rails-controller-testing rspec-rails sass-rails (~> 5.0) selenium-webdriver