From e46b50e805e80d78c0efa39af3bd822912f2cdb9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Jan 2021 11:10:23 +0900
Subject: [PATCH] Bump capistrano from 3.14.1 to 3.15.0 (#15537)
* Bump capistrano from 3.14.1 to 3.15.0
Bumps [capistrano](https://github.com/capistrano/capistrano) from 3.14.1 to 3.15.0.
- [Release notes](https://github.com/capistrano/capistrano/releases)
- [Commits](https://github.com/capistrano/capistrano/compare/v3.14.1...v3.15.0)
Signed-off-by: dependabot[bot] <support@github.com>
* Fix config/deploy.rb
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
---
Gemfile | 2 +-
Gemfile.lock | 8 ++++----
config/deploy.rb | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Gemfile b/Gemfile
index 75ecbda04b..5454140ea6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -143,7 +143,7 @@ group :development do
gem 'brakeman', '~> 4.10', require: false
gem 'bundler-audit', '~> 0.7', require: false
- gem 'capistrano', '~> 3.14'
+ gem 'capistrano', '~> 3.15'
gem 'capistrano-rails', '~> 1.6'
gem 'capistrano-rbenv', '~> 2.2'
gem 'capistrano-yarn', '~> 2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 85767aa149..7b677837f7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -116,7 +116,7 @@ GEM
bundler (>= 1.2.0, < 3)
thor (>= 0.18, < 2)
byebug (11.1.3)
- capistrano (3.14.1)
+ capistrano (3.15.0)
airbrussh (>= 1.0.0)
i18n
rake (>= 10.0.0)
@@ -272,7 +272,7 @@ GEM
httplog (1.4.3)
rack (>= 1.0)
rainbow (>= 2.0.0)
- i18n (1.8.5)
+ i18n (1.8.7)
concurrent-ruby (~> 1.0)
i18n-tasks (0.9.33)
activesupport (>= 4.0.2)
@@ -604,7 +604,7 @@ GEM
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
- sshkit (1.21.0)
+ sshkit (1.21.1)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
stackprof (0.2.16)
@@ -697,7 +697,7 @@ DEPENDENCIES
browser
bullet (~> 6.1)
bundler-audit (~> 0.7)
- capistrano (~> 3.14)
+ capistrano (~> 3.15)
capistrano-rails (~> 1.6)
capistrano-rbenv (~> 2.2)
capistrano-yarn (~> 2.0)
diff --git a/config/deploy.rb b/config/deploy.rb
index 5d68735886..c0d72f48ff 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-lock '3.14.1'
+lock '3.15.0'
set :repo_url, ENV.fetch('REPO', 'https://github.com/tootsuite/mastodon.git')
set :branch, ENV.fetch('BRANCH', 'master')
--
GitLab