Commit f4214909af5fe789aab3d6c04cef5bb51dc0327b
1 parent
b09b57cf
Exists in
colab
and in
4 other branches
Updated capistrano
Showing
3 changed files
with
7 additions
and
7 deletions
Show diff stats
Capfile
| 1 | load 'deploy' | 1 | load 'deploy' |
| 2 | -# Uncomment if you are using Rails' asset pipeline | ||
| 3 | - # load 'deploy/assets' | 2 | +load 'deploy/assets' |
| 4 | load 'config/deploy' # remove this line to skip loading any of the default tasks | 3 | load 'config/deploy' # remove this line to skip loading any of the default tasks |
| 5 | \ No newline at end of file | 4 | \ No newline at end of file |
Gemfile.lock
| @@ -29,7 +29,7 @@ GEM | @@ -29,7 +29,7 @@ GEM | ||
| 29 | atomic (1.1.10) | 29 | atomic (1.1.10) |
| 30 | bcrypt-ruby (3.1.1) | 30 | bcrypt-ruby (3.1.1) |
| 31 | builder (3.1.4) | 31 | builder (3.1.4) |
| 32 | - capistrano (2.15.4) | 32 | + capistrano (2.15.5) |
| 33 | highline | 33 | highline |
| 34 | net-scp (>= 1.0.0) | 34 | net-scp (>= 1.0.0) |
| 35 | net-sftp (>= 2.0.0) | 35 | net-sftp (>= 2.0.0) |
| @@ -93,11 +93,11 @@ GEM | @@ -93,11 +93,11 @@ GEM | ||
| 93 | minitest (4.7.5) | 93 | minitest (4.7.5) |
| 94 | modernizr-rails (2.6.2.3) | 94 | modernizr-rails (2.6.2.3) |
| 95 | multi_json (1.7.7) | 95 | multi_json (1.7.7) |
| 96 | - net-scp (1.1.1) | 96 | + net-scp (1.1.2) |
| 97 | net-ssh (>= 2.6.5) | 97 | net-ssh (>= 2.6.5) |
| 98 | net-sftp (2.1.2) | 98 | net-sftp (2.1.2) |
| 99 | net-ssh (>= 2.6.5) | 99 | net-ssh (>= 2.6.5) |
| 100 | - net-ssh (2.6.7) | 100 | + net-ssh (2.6.8) |
| 101 | net-ssh-gateway (1.2.0) | 101 | net-ssh-gateway (1.2.0) |
| 102 | net-ssh (>= 2.6.5) | 102 | net-ssh (>= 2.6.5) |
| 103 | nokogiri (1.6.0) | 103 | nokogiri (1.6.0) |
| @@ -135,7 +135,7 @@ GEM | @@ -135,7 +135,7 @@ GEM | ||
| 135 | rspec-core (~> 2.14.0) | 135 | rspec-core (~> 2.14.0) |
| 136 | rspec-expectations (~> 2.14.0) | 136 | rspec-expectations (~> 2.14.0) |
| 137 | rspec-mocks (~> 2.14.0) | 137 | rspec-mocks (~> 2.14.0) |
| 138 | - rvm-capistrano (1.3.4) | 138 | + rvm-capistrano (1.4.1) |
| 139 | capistrano (>= 2.0.0) | 139 | capistrano (>= 2.0.0) |
| 140 | sass (3.2.9) | 140 | sass (3.2.9) |
| 141 | sass-rails (4.0.0) | 141 | sass-rails (4.0.0) |
| @@ -174,7 +174,7 @@ GEM | @@ -174,7 +174,7 @@ GEM | ||
| 174 | turbolinks (1.3.0) | 174 | turbolinks (1.3.0) |
| 175 | coffee-rails | 175 | coffee-rails |
| 176 | tzinfo (0.3.37) | 176 | tzinfo (0.3.37) |
| 177 | - uglifier (2.1.1) | 177 | + uglifier (2.1.2) |
| 178 | execjs (>= 0.3.0) | 178 | execjs (>= 0.3.0) |
| 179 | multi_json (~> 1.0, >= 1.0.2) | 179 | multi_json (~> 1.0, >= 1.0.2) |
| 180 | warden (1.2.3) | 180 | warden (1.2.3) |
config/deploy.rb
| 1 | require "rvm/capistrano" | 1 | require "rvm/capistrano" |
| 2 | +require 'bundler/capistrano' | ||
| 2 | 3 | ||
| 3 | set :rvm_ruby_string, :local # use the same ruby as used locally for deployment | 4 | set :rvm_ruby_string, :local # use the same ruby as used locally for deployment |
| 4 | set :rvm_autolibs_flag, "read-only" # more info: rvm help autolibs | 5 | set :rvm_autolibs_flag, "read-only" # more info: rvm help autolibs |