From 865cb39e9b27caf46c7592a5a36918afdf5e4104 Mon Sep 17 00:00:00 2001
From: Alex Dunn <dunn.alex@gmail.com>
Date: Sun, 16 Apr 2017 03:52:18 -0700
Subject: [PATCH] lock capistrano to 3.8.0 (#1890)

---
 Gemfile          | 2 +-
 Gemfile.lock     | 4 ++--
 config/deploy.rb | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 57600ed9f8..5d75c11ea7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -88,7 +88,7 @@ group :development do
   gem 'bullet'
   gem 'active_record_query_trace'
 
-  gem 'capistrano'
+  gem 'capistrano', '3.8.0'
   gem 'capistrano-rails'
   gem 'capistrano-rbenv'
   gem 'capistrano-yarn'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2f55abec71..4b4dd105cc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -41,7 +41,7 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
-    airbrussh (1.1.2)
+    airbrussh (1.2.0)
       sshkit (>= 1.6.1, != 1.7.0)
     arel (7.1.4)
     ast (2.3.0)
@@ -469,7 +469,7 @@ DEPENDENCIES
   binding_of_caller
   browserify-rails
   bullet
-  capistrano
+  capistrano (= 3.8.0)
   capistrano-faster-assets (~> 1.0)
   capistrano-rails
   capistrano-rbenv
diff --git a/config/deploy.rb b/config/deploy.rb
index 9bcf907be1..b1cade49d4 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,4 +1,7 @@
-lock '3.7.2'
+# frozen_string_literal: true
+
+lock '3.8.0'
+
 set :repo_url, ENV.fetch('REPO', 'https://github.com/tootsuite/mastodon.git')
 set :branch, ENV.fetch('BRANCH', 'master')