aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Eilertsen <haraldei@anduin.net>2015-12-22 12:07:52 +0100
committerHarald Eilertsen <haraldei@anduin.net>2015-12-22 12:07:52 +0100
commit7d0288453ebae51cdcc547303ff98cffb629fad2 (patch)
treea3698584217b49af79c4023a3c2dd7238dbdab1d
parentf0beca3ed8822d9ecb823c3ad36875c0e00a1118 (diff)
downloadhmnoweb-7d0288453ebae51cdcc547303ff98cffb629fad2.tar.gz
hmnoweb-7d0288453ebae51cdcc547303ff98cffb629fad2.tar.bz2
hmnoweb-7d0288453ebae51cdcc547303ff98cffb629fad2.zip
Update capistrano-passenger, and add to Capfile.
The new capistrano-passenger module has better support for restarting the app, and integrates better with RVM.
-rw-r--r--Capfile1
-rw-r--r--Gemfile.lock6
2 files changed, 3 insertions, 4 deletions
diff --git a/Capfile b/Capfile
index 897c028..44d4253 100644
--- a/Capfile
+++ b/Capfile
@@ -21,6 +21,7 @@ require 'capistrano/bundler'
require 'capistrano/rails/assets'
require 'capistrano/rails/migrations'
require 'capistrano/postgresql'
+require 'capistrano/passenger'
# 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.lock b/Gemfile.lock
index 10c7fbf..8f69ac5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -78,7 +78,7 @@ GEM
capistrano-bundler (1.1.2)
capistrano (~> 3.0)
sshkit (~> 1.2)
- capistrano-passenger (0.0.1)
+ capistrano-passenger (0.2.0)
capistrano (~> 3.0)
capistrano-rails (1.1.1)
capistrano (~> 3.1)
@@ -94,7 +94,6 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.6.2)
- colorize (0.7.7)
decorators (1.0.5)
railties (>= 3.0.19)
devise (2.2.8)
@@ -243,8 +242,7 @@ GEM
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.11)
- sshkit (1.7.1)
- colorize (>= 0.7.0)
+ sshkit (1.8.1)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
thor (0.19.1)