diff --git a/Capfile b/Capfile index e47ebb4fd..ddb830a70 100644 --- a/Capfile +++ b/Capfile @@ -14,6 +14,7 @@ require "rvm1/capistrano3" require "capistrano/puma" install_plugin Capistrano::Puma, load_hooks: false +install_plugin Capistrano::Puma::Daemon #SCM: Git require "capistrano/scm/git" diff --git a/Gemfile b/Gemfile index 754bfca44..1612f9008 100644 --- a/Gemfile +++ b/Gemfile @@ -98,7 +98,7 @@ group :development do gem "capistrano-bundler", "~> 2.0", require: false gem "capistrano-rails", "~> 1.6.1", require: false gem "capistrano3-delayed-job", "~> 1.7.6" - gem "capistrano3-puma", "~> 4.0.0" + gem "capistrano3-puma", "~> 5.0.4" gem "erb_lint", "~> 0.0.37", require: false gem "github_changelog_generator", "~> 1.15.2" gem "mdl", "~> 0.11.0", require: false diff --git a/Gemfile.lock b/Gemfile.lock index c2933bb71..9c41a73f7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -109,10 +109,10 @@ GEM capistrano3-delayed-job (1.7.6) capistrano (~> 3.0, >= 3.0.0) daemons (~> 1.3) - capistrano3-puma (4.0.0) + capistrano3-puma (5.0.4) capistrano (~> 3.7) capistrano-bundler - puma (~> 4.0) + puma (>= 4.0, < 6.0) capybara (3.35.3) addressable mini_mime (>= 0.1.3) @@ -713,7 +713,7 @@ DEPENDENCIES capistrano-bundler (~> 2.0) capistrano-rails (~> 1.6.1) capistrano3-delayed-job (~> 1.7.6) - capistrano3-puma (~> 4.0.0) + capistrano3-puma (~> 5.0.4) capybara (~> 3.35.3) capybara-webmock (~> 0.5.5) caxlsx (~> 3.0.2) diff --git a/config/deploy.rb b/config/deploy.rb index 417cf3a99..0273ee204 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,5 +1,5 @@ # config valid only for current version of Capistrano -lock "~> 3.14.1" +lock "~> 3.16.0" def deploysecret(key) @deploy_secrets_yml ||= YAML.load_file("config/deploy-secrets.yml")[fetch(:stage).to_s]