diff --git a/Gemfile b/Gemfile index 9210d0f..4db00f8 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ gem 'rails', '~> 5.1.6', '>= 5.1.6.1' # Use postgresql as the database for Active Record gem 'pg', '>= 0.18', '< 2.0' # Use Puma as the app server -gem 'puma', '~> 3.7' +gem 'puma', '~> 5.6', '>= 5.6.7' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 2.5' # Use Redis adapter to run Action Cable in production @@ -25,7 +25,7 @@ group :development do gem 'capistrano-rvm', require: false gem 'capistrano-rails', require: false gem 'capistrano-bundler', require: false - gem 'capistrano3-puma', require: false + gem 'capistrano3-puma', '>= 5.0.0', require: false end # Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible diff --git a/Gemfile.lock b/Gemfile.lock index fdbe7bc..53483b7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -69,7 +69,7 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - airbrussh (1.3.0) + airbrussh (1.4.2) sshkit (>= 1.6.1, != 1.7.0) arbre (1.1.1) activesupport (>= 3.0.0) @@ -81,26 +81,25 @@ GEM bcrypt (3.1.12) builder (3.2.3) byebug (10.0.0) - capistrano (3.10.1) + capistrano (3.17.3) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) sshkit (>= 1.9.0) - capistrano-bundler (1.3.0) + capistrano-bundler (1.6.0) capistrano (~> 3.1) - sshkit (~> 1.2) capistrano-rails (1.3.1) capistrano (~> 3.1) capistrano-bundler (~> 1.1) capistrano-rvm (0.1.2) capistrano (~> 3.0) sshkit (~> 1.2) - capistrano3-puma (3.1.1) + capistrano3-puma (5.2.0) capistrano (~> 3.7) capistrano-bundler - puma (~> 3.4) + puma (>= 4.0, < 6.0) chunky_png (1.3.10) - concurrent-ruby (1.1.3) + concurrent-ruby (1.2.2) crass (1.0.4) devise (4.5.0) bcrypt (~> 3.0) @@ -125,7 +124,7 @@ GEM has_scope (0.7.2) actionpack (>= 4.1) activesupport (>= 4.1) - i18n (1.1.1) + i18n (1.14.1) concurrent-ruby (~> 1.0) jbuilder (2.7.0) activesupport (>= 4.2.0) @@ -160,9 +159,9 @@ GEM mini_portile2 (2.3.0) minitest (5.11.3) multi_json (1.13.1) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-ssh (4.2.0) + net-scp (4.0.0) + net-ssh (>= 2.6.5, < 8.0.0) + net-ssh (7.2.0) nio4r (2.3.1) nokogiri (1.8.5) mini_portile2 (~> 2.3.0) @@ -172,7 +171,8 @@ GEM pg (1.0.0) polyamorous (1.3.3) activerecord (>= 3.0) - puma (3.11.2) + puma (5.6.7) + nio4r (~> 2.0) rack (2.0.6) rack-cors (1.0.2) rack-test (1.1.0) @@ -200,7 +200,7 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.3.1) + rake (13.0.6) ransack (1.8.7) actionpack (>= 3.0) activerecord (>= 3.0) @@ -238,7 +238,7 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sshkit (1.16.0) + sshkit (1.21.5) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) thor (0.20.3) @@ -262,7 +262,7 @@ DEPENDENCIES capistrano-bundler capistrano-rails capistrano-rvm - capistrano3-puma + capistrano3-puma (>= 5.0.0) devise (>= 4.4.1) draper (>= 3.0.1) inherited_resources! @@ -270,7 +270,7 @@ DEPENDENCIES listen (>= 3.1.5, < 3.2) oily_png pg (>= 0.18, < 2.0) - puma (~> 3.7) + puma (~> 5.6, >= 5.6.7) rack-cors rails (~> 5.1.6, >= 5.1.6.1) redis (~> 4.0) @@ -279,4 +279,4 @@ DEPENDENCIES tzinfo-data BUNDLED WITH - 1.17.1 + 1.17.3