Skip to content

Commit fe18bf7

Browse files
committed
update capistrano
1 parent c807c94 commit fe18bf7

File tree

2 files changed

+11
-10
lines changed

2 files changed

+11
-10
lines changed

Capfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
load 'deploy' if respond_to?(:namespace) # cap2 differentiator
22
Dir['vendor/gems/*/recipes/*.rb','vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
33

4-
load 'config/deploy' # remove this line to skip loading any of the default tasks
4+
load 'deploy/assets'
5+
load 'config/deploy' # remove this line to skip loading any of the default tasks

Gemfile.lock

+9-9
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ GEM
3939
activerecord (>= 3.0.0)
4040
bcrypt-ruby (3.0.1)
4141
builder (3.0.4)
42-
capistrano (2.6.0)
42+
capistrano (2.15.2)
4343
highline
4444
net-scp (>= 1.0.0)
4545
net-sftp (>= 2.0.0)
@@ -94,7 +94,7 @@ GEM
9494
execjs
9595
railties (>= 3.1)
9696
haml (3.1.7)
97-
highline (1.6.2)
97+
highline (1.6.18)
9898
hike (1.2.1)
9999
i18n (0.6.4)
100100
journey (1.0.4)
@@ -118,13 +118,13 @@ GEM
118118
mizugumo (0.2.0)
119119
multi_json (1.0.4)
120120
mysql2 (0.3.11)
121-
net-scp (1.0.4)
122-
net-ssh (>= 1.99.1)
123-
net-sftp (2.0.5)
124-
net-ssh (>= 2.0.9)
125-
net-ssh (2.1.4)
126-
net-ssh-gateway (1.1.0)
127-
net-ssh (>= 1.99.1)
121+
net-scp (1.1.0)
122+
net-ssh (>= 2.6.5)
123+
net-sftp (2.1.1)
124+
net-ssh (>= 2.6.5)
125+
net-ssh (2.6.7)
126+
net-ssh-gateway (1.2.0)
127+
net-ssh (>= 2.6.5)
128128
nokogiri (1.5.6)
129129
orm_adapter (0.4.0)
130130
pivotal-github (0.6.12)

0 commit comments

Comments
 (0)