diff --git a/Gemfile.lock b/Gemfile.lock index 24dbf8a..e2d6611 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,18 +50,19 @@ GEM airbrake (3.1.5) builder girl_friday + airbrussh (1.3.3) + sshkit (>= 1.6.1, != 1.7.0) arel (3.0.2) bcrypt-ruby (3.0.1) bigdecimal (1.1.0) bootstrap-sass (2.1.0.0) builder (3.0.4) cancan (1.6.8) - capistrano (2.13.4) - highline - net-scp (>= 1.0.0) - net-sftp (>= 2.0.0) - net-ssh (>= 2.0.14) - net-ssh-gateway (>= 1.1.0) + capistrano (3.11.0) + airbrussh (>= 1.0.0) + i18n + rake (>= 10.0.0) + sshkit (>= 1.9.0) capybara (1.1.2) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -105,8 +106,7 @@ GEM railties (>= 3.1, < 4.1) hashery (2.0.1) hashie (1.2.0) - highline (1.6.15) - hike (1.2.1) + hike (1.2.3) hpricot (0.8.6) httparty (0.9.0) multi_json (~> 1.0) @@ -120,7 +120,6 @@ GEM jquery-ui-rails (2.0.1) jquery-rails railties (>= 3.1.0) - jruby-pageant (1.1.1) json (1.7.6) jwt (0.1.5) multi_json (>= 1.0) @@ -141,19 +140,14 @@ GEM maruku (0.6.1) syntax (>= 1.0.0) mime-types (1.19) - multi_json (1.5.0) + multi_json (1.13.1) multi_xml (0.5.1) multipart-post (1.1.5) mysql2 (0.3.11) nested_form (0.2.3) - net-scp (1.0.4) - net-ssh (>= 1.99.1) - net-sftp (2.0.5) - net-ssh (>= 2.0.9) - net-ssh (2.6.0) - jruby-pageant (>= 1.1.1) - net-ssh-gateway (1.1.0) - net-ssh (>= 1.99.1) + net-scp (2.0.0) + net-ssh (>= 2.6.5, < 6.0.0) + net-ssh (5.2.0) nokogiri (1.5.5) oauth2 (0.8.0) faraday (~> 0.8) @@ -190,7 +184,7 @@ GEM rabl (0.7.9) activesupport (>= 2.3.14) multi_json (~> 1.0) - rack (1.4.3) + rack (1.4.7) rack-cache (1.2) rack (>= 0.4) rack-openid (1.3.1) @@ -277,16 +271,19 @@ GEM multi_json (~> 1.0) simplecov-html (~> 0.5.3) simplecov-html (0.5.3) - sprockets (2.2.2) + sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) + sshkit (1.20.0) + net-scp (>= 1.1.2) + net-ssh (>= 2.8.0) syntax (1.0.0) therubyracer (0.11.0beta8) ref thor (0.16.0) - tilt (1.3.3) + tilt (1.4.1) treetop (1.4.12) polyglot polyglot (>= 0.3.1)