From ad9c862bb1247b5a1724f59d009b9bb4eb86193e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 8 May 2020 21:29:03 +0200 Subject: [PATCH] Bump capistrano from 3.13.0 to 3.14.0 (#13624) * Bump capistrano from 3.13.0 to 3.14.0 Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.13.0 to 3.14.0. - [Release notes](https://github.com/capistrano/capistrano/releases) - [Commits](https://github.com/capistrano/capistrano/compare/v3.13.0...v3.14.0) Signed-off-by: dependabot-preview[bot] * Update deploy.rb Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Eugen Rochko --- Gemfile | 2 +- Gemfile.lock | 4 ++-- config/deploy.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 81dc10af58..890b0ee97e 100644 --- a/Gemfile +++ b/Gemfile @@ -144,7 +144,7 @@ group :development do gem 'brakeman', '~> 4.8', require: false gem 'bundler-audit', '~> 0.6', require: false - gem 'capistrano', '~> 3.13' + gem 'capistrano', '~> 3.14' gem 'capistrano-rails', '~> 1.4' gem 'capistrano-rbenv', '~> 2.1' gem 'capistrano-yarn', '~> 2.0' diff --git a/Gemfile.lock b/Gemfile.lock index 2ffaa96734..1e0df74833 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -128,7 +128,7 @@ GEM bundler (>= 1.2.0, < 3) thor (~> 0.18) byebug (11.1.3) - capistrano (3.13.0) + capistrano (3.14.0) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) @@ -682,7 +682,7 @@ DEPENDENCIES browser bullet (~> 6.1) bundler-audit (~> 0.6) - capistrano (~> 3.13) + capistrano (~> 3.14) capistrano-rails (~> 1.4) capistrano-rbenv (~> 2.1) capistrano-yarn (~> 2.0) diff --git a/config/deploy.rb b/config/deploy.rb index 79550baedf..31d1422753 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -lock '3.12.1' +lock '3.14.0' set :repo_url, ENV.fetch('REPO', 'https://github.com/tootsuite/mastodon.git') set :branch, ENV.fetch('BRANCH', 'master')