diff --git a/Gemfile.lock b/Gemfile.lock index 2541fd8..84b5964 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,7 +48,7 @@ GEM sass (>= 3.1) builder (3.0.0) cancan (1.6.8) - capistrano (2.13.4) + capistrano (2.15.9) highline net-scp (>= 1.0.0) net-sftp (>= 2.0.0) @@ -75,6 +75,7 @@ GEM coffee-script-source (1.3.3) comma (3.0.3) commonjs (0.2.6) + concurrent-ruby (1.1.5) daemon_controller (1.0.0) daemons (1.1.8) devise (2.1.2) @@ -103,9 +104,10 @@ GEM guard-rspec (1.1.0) guard (>= 1.1) has_scope (0.5.1) - highline (1.6.15) + highline (2.0.3) hike (1.2.1) - i18n (0.6.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) inherited_resources (1.3.1) has_scope (~> 0.5.0) responders (~> 0.6) @@ -113,7 +115,6 @@ GEM jquery-rails (2.0.2) railties (>= 3.2.0, < 5.0) thor (~> 0.14) - jruby-pageant (1.1.1) json (1.7.5) kaminari (0.13.0) actionpack (>= 3.0.0) @@ -145,14 +146,13 @@ GEM mime-types (1.19) multi_json (1.3.6) mysql2 (0.3.11) - 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-sftp (2.1.2) + net-ssh (>= 2.6.5) + net-ssh (5.2.0) + net-ssh-gateway (2.0.0) + net-ssh (>= 4.0.0) nokogiri (1.5.5) orm_adapter (0.4.0) passenger (3.0.17)