From 575d9a19989e0de4647828a52f94ae7723e49915 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= <jjbazan@gmail.com>
Date: Mon, 11 Jul 2016 14:21:54 +0200
Subject: [PATCH] updates capistrano

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

diff --git a/Gemfile b/Gemfile
index e23636192..9c22b5f60 100644
--- a/Gemfile
+++ b/Gemfile
@@ -74,7 +74,7 @@ group :development, :test do
   gem 'quiet_assets'
   gem 'letter_opener_web', '~> 1.3.0'
   gem 'i18n-tasks'
-  gem 'capistrano', '3.4.1',           require: false
+  gem 'capistrano', '3.5.0',           require: false
   gem "capistrano-bundler", '1.1.4',   require: false
   gem "capistrano-rails", '1.1.7',     require: false
   gem "capistrano-rvm",                require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 635db8a43..f7a23b11f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -51,6 +51,8 @@ GEM
       safely_block (>= 0.1.1)
       user_agent_parser
       uuidtools
+    airbrussh (1.0.2)
+      sshkit (>= 1.6.1, != 1.7.0)
     akami (1.3.1)
       gyoku (>= 0.4.0)
       nokogiri
@@ -70,13 +72,16 @@ GEM
       uniform_notifier (~> 1.10.0)
     byebug (9.0.5)
     cancancan (1.15.0)
-    capistrano (3.4.1)
+    capistrano (3.5.0)
+      airbrussh (>= 1.0.0)
+      capistrano-harrow
       i18n
       rake (>= 10.0.0)
-      sshkit (~> 1.3)
+      sshkit (>= 1.9.0)
     capistrano-bundler (1.1.4)
       capistrano (~> 3.1)
       sshkit (~> 1.2)
+    capistrano-harrow (0.5.2)
     capistrano-rails (1.1.7)
       capistrano (~> 3.1)
       capistrano-bundler (~> 1.1)
@@ -440,7 +445,7 @@ DEPENDENCIES
   bullet
   byebug
   cancancan
-  capistrano (= 3.4.1)
+  capistrano (= 3.5.0)
   capistrano-bundler (= 1.1.4)
   capistrano-rails (= 1.1.7)
   capistrano-rvm
diff --git a/config/deploy.rb b/config/deploy.rb
index 6c1af4b9d..46cbbfa9f 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,5 +1,5 @@
 # config valid only for current version of Capistrano
-lock '3.4.1'
+lock '3.5.0'
 
 def deploysecret(key)
   @deploy_secrets_yml ||= YAML.load_file('config/deploy-secrets.yml')[fetch(:stage).to_s]