aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Eilertsen <haraldei@anduin.net>2017-12-26 19:43:18 +0100
committerHarald Eilertsen <haraldei@anduin.net>2017-12-26 19:43:18 +0100
commit4bb64a9f140266dccd9601b653c71b556f96fad7 (patch)
treecb9e0f028f0d9991d0a47696bd9f02525e63410e
parent2612e429af202633bc1472a46157d8803bf7037c (diff)
downloadhmnoweb-4bb64a9f140266dccd9601b653c71b556f96fad7.tar.gz
hmnoweb-4bb64a9f140266dccd9601b653c71b556f96fad7.tar.bz2
hmnoweb-4bb64a9f140266dccd9601b653c71b556f96fad7.zip
Upgrade capistrano to version 3.10.1
-rw-r--r--Capfile3
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock11
3 files changed, 10 insertions, 6 deletions
diff --git a/Capfile b/Capfile
index 7c089aa..735eb24 100644
--- a/Capfile
+++ b/Capfile
@@ -18,10 +18,13 @@ require 'capistrano/deploy'
# require 'capistrano/rbenv'
# require 'capistrano/chruby'
require 'capistrano/bundler'
+require 'capistrano/scm/git'
require 'capistrano/rails/assets'
require 'capistrano/rails/migrations'
require 'capistrano/postgresql'
# require 'capistrano/passenger'
+install_plugin Capistrano::SCM::Git
+
# Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
diff --git a/Gemfile b/Gemfile
index aefd8ef..72fb0c0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,7 @@ end
group :deployment do
# Deploy with Capistrano
- gem 'capistrano', '~> 3.3.4'
+ gem 'capistrano', '~> 3.10.0'
gem 'capistrano-bundler'
gem 'capistrano-rails'
gem 'capistrano-postgresql', '~> 4.7.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2f177ef..ad1b897 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -71,17 +71,19 @@ GEM
acts-as-taggable-on (2.4.1)
rails (>= 3, < 5)
acts_as_indexed (0.8.3)
+ airbrussh (1.3.0)
+ sshkit (>= 1.6.1, != 1.7.0)
arel (3.0.3)
awesome_nested_set (2.1.6)
activerecord (>= 3.0.0)
babosa (1.0.2)
bcrypt-ruby (3.0.1)
builder (3.0.4)
- capistrano (3.3.5)
- capistrano-stats (~> 1.1.0)
+ capistrano (3.10.1)
+ airbrussh (>= 1.0.0)
i18n
rake (>= 10.0.0)
- sshkit (~> 1.3)
+ sshkit (>= 1.9.0)
capistrano-bundler (1.1.2)
capistrano (~> 3.0)
sshkit (~> 1.2)
@@ -90,7 +92,6 @@ GEM
capistrano-rails (1.1.1)
capistrano (~> 3.1)
capistrano-bundler (~> 1.1)
- capistrano-stats (1.1.1)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
@@ -269,7 +270,7 @@ DEPENDENCIES
SyslogLogger
activerecord-postgresql-adapter
bcrypt-ruby (~> 3.0.0)
- capistrano (~> 3.3.4)
+ capistrano (~> 3.10.0)
capistrano-bundler
capistrano-postgresql (~> 4.7.0)
capistrano-rails