Commit 1573bdaaed50bcc86115ec8b84cfde322f5814e4

Authored by Arthur Nogueira Neves
2 parents 91b381e0 0e046f62
Exists in master and in 1 other branch production

Merge pull request #843 from chulkilee/capistrano-3.4

upgrade capistrano to 3.4.0
.gitignore
... ... @@ -21,4 +21,3 @@ bundle
21 21 coverage
22 22 *#
23 23 .ruby-version
24   -.capistrano/metrics
... ...
Gemfile.lock
... ... @@ -65,21 +65,19 @@ GEM
65 65 debugger-linecache (~> 1.2)
66 66 callsite (0.0.11)
67 67 campy (1.0.0)
68   - capistrano (3.3.5)
69   - capistrano-stats (~> 1.1.0)
  68 + capistrano (3.4.0)
70 69 i18n
71 70 rake (>= 10.0.0)
72 71 sshkit (~> 1.3)
73   - capistrano-bundler (1.1.3)
  72 + capistrano-bundler (1.1.4)
74 73 capistrano (~> 3.1)
75 74 sshkit (~> 1.2)
76 75 capistrano-rails (1.1.2)
77 76 capistrano (~> 3.1)
78 77 capistrano-bundler (~> 1.1)
79   - capistrano-rbenv (2.0.2)
  78 + capistrano-rbenv (2.0.3)
80 79 capistrano (~> 3.1)
81 80 sshkit (~> 1.3)
82   - capistrano-stats (1.1.1)
83 81 capybara (2.4.4)
84 82 mime-types (>= 1.16)
85 83 nokogiri (>= 1.3.3)
... ... @@ -208,7 +206,7 @@ GEM
208 206 multipart-post (1.2.0)
209 207 net-scp (1.2.1)
210 208 net-ssh (>= 2.6.5)
211   - net-ssh (2.9.1)
  209 + net-ssh (2.9.2)
212 210 nokogiri (1.6.5)
213 211 mini_portile (~> 0.6.0)
214 212 nokogiri (1.6.5-java)
... ... @@ -356,7 +354,7 @@ GEM
356 354 actionpack (>= 3.0)
357 355 activesupport (>= 3.0)
358 356 sprockets (>= 2.8, < 4.0)
359   - sshkit (1.6.1)
  357 + sshkit (1.7.1)
360 358 colorize (>= 0.7.0)
361 359 net-scp (>= 1.1.2)
362 360 net-ssh (>= 2.8.0)
... ...
config/deploy.example.rb
... ... @@ -7,7 +7,7 @@
7 7 # to ./docs/deployment/capistrano.md for more info
8 8  
9 9 # config valid only for current version of Capistrano
10   -lock '3.3.5'
  10 +lock '3.4.0'
11 11  
12 12 set :application, 'errbit'
13 13 set :repo_url, 'https://github.com/errbit/errbit.git'
... ...