diff --git a/Gemfile b/Gemfile index 9e27be2..bfc4c9b 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'rails', '~> 5.2.1' # Use sqlite3 as the database for Active Record gem 'sqlite3' # Use Puma as the app server -gem 'puma', '~> 4.3.11' +gem 'puma', '~> 4.3.12' # 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 652534d..79238ea 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -49,6 +49,7 @@ GEM archive-zip (0.11.0) io-like (~> 0.3.0) arel (9.0.0) + bcrypt_pbkdf (1.1.0) bindex (0.5.0) bootsnap (1.3.2) msgpack (~> 1.0) @@ -65,10 +66,13 @@ GEM capistrano-rails (1.4.0) capistrano (~> 3.1) capistrano-bundler (~> 1.1) - capistrano3-puma (3.1.1) + capistrano-rbenv (2.2.0) + capistrano (~> 3.1) + sshkit (~> 1.3) + capistrano3-puma (5.2.0) capistrano (~> 3.7) capistrano-bundler - puma (~> 3.4) + puma (>= 4.0, < 6.0) capybara (3.9.0) addressable mini_mime (>= 0.1.3) @@ -90,6 +94,7 @@ GEM coffee-script-source (1.12.2) concurrent-ruby (1.0.5) crass (1.0.4) + ed25519 (1.3.0) erubi (1.7.1) execjs (2.7.0) ffi (1.9.25) @@ -113,7 +118,9 @@ GEM marcel (0.3.3) mimemagic (~> 0.3.2) method_source (0.9.0) - mimemagic (0.3.2) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.11.3) @@ -127,7 +134,8 @@ GEM nokogiri (1.8.4) mini_portile2 (~> 2.3.0) public_suffix (3.0.3) - puma (3.12.0) + puma (4.3.12) + nio4r (~> 2.0) rack (2.0.5) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -161,9 +169,6 @@ GEM ffi (>= 0.5.0, < 2) ruby_dep (1.5.0) rubyzip (1.2.2) - rvm1-capistrano3 (1.4.0) - capistrano (~> 3.0) - sshkit (>= 1.2) sass (3.6.0) sass-listen (~> 4.0.0) sass-listen (4.0.0) @@ -219,21 +224,23 @@ PLATFORMS ruby DEPENDENCIES + bcrypt_pbkdf (>= 1.0, < 2.0) bootsnap (>= 1.1.0) byebug capistrano (~> 3.10) capistrano-bundler (>= 1.1.0) capistrano-rails (~> 1.4) - capistrano3-puma + capistrano-rbenv (~> 2.2) + capistrano3-puma (= 5.2.0) capybara (>= 2.15) chromedriver-helper coffee-rails (~> 4.2) + ed25519 (>= 1.2, < 2.0) jbuilder (~> 2.5) listen (>= 3.0.5, < 3.2) mysql2 - puma (~> 3.11) + puma (~> 4.3.12) rails (~> 5.2.1) - rvm1-capistrano3 sass-rails (~> 5.0) selenium-webdriver spring