diff --git a/Gemfile b/Gemfile index eacd2c652..404390a16 100644 --- a/Gemfile +++ b/Gemfile @@ -91,7 +91,7 @@ group :test do end group :development do - gem "capistrano", "~> 3.17.3", require: false + gem "capistrano", "~> 3.18.1", require: false gem "capistrano-bundler", "~> 2.1.0", require: false gem "capistrano-npm", "~> 1.0.3", require: false gem "capistrano-rails", "~> 1.6.3", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 703c909b6..d12c70027 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -80,7 +80,7 @@ GEM airbrake-ruby (~> 6.0) airbrake-ruby (6.2.2) rbtree3 (~> 0.6) - airbrussh (1.4.2) + airbrussh (1.5.1) sshkit (>= 1.6.1, != 1.7.0) akami (1.3.1) gyoku (>= 0.4.0) @@ -115,7 +115,7 @@ GEM uniform_notifier (~> 1.11) byebug (11.1.3) cancancan (3.5.0) - capistrano (3.17.3) + capistrano (3.18.1) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) @@ -356,6 +356,7 @@ GEM chef-utils multi_json (1.15.0) multi_xml (0.6.0) + mutex_m (0.2.0) net-http (0.4.1) uri net-imap (0.4.10) @@ -367,9 +368,11 @@ GEM timeout net-scp (4.0.0) net-ssh (>= 2.6.5, < 8.0.0) + net-sftp (4.0.0) + net-ssh (>= 5.0.0, < 8.0.0) net-smtp (0.4.0.1) net-protocol - net-ssh (7.2.0) + net-ssh (7.2.1) nio4r (2.7.0) nokogiri (1.16.3) mini_portile2 (~> 2.8.2) @@ -629,8 +632,10 @@ GEM actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - sshkit (1.21.5) + sshkit (1.22.0) + mutex_m net-scp (>= 1.1.2) + net-sftp (>= 2.1.2) net-ssh (>= 2.8.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -702,7 +707,7 @@ DEPENDENCIES bullet (~> 7.1.6) byebug (~> 11.1.3) cancancan (~> 3.5.0) - capistrano (~> 3.17.3) + capistrano (~> 3.18.1) capistrano-bundler (~> 2.1.0) capistrano-npm (~> 1.0.3) capistrano-rails (~> 1.6.3) diff --git a/config/deploy.rb b/config/deploy.rb index 619c0a876..4657864a1 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,5 +1,5 @@ # config valid only for current version of Capistrano -lock "~> 3.17.1" +lock "~> 3.18.1" def deploysecret(key, default: "") @deploy_secrets_yml ||= YAML.load_file("config/deploy-secrets.yml", aliases: true)[fetch(:stage).to_s]