diff --git a/Gemfile.lock b/Gemfile.lock index 0bfd76a..745860b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -44,7 +44,7 @@ GEM cucumber (>= 1.1.1) ffi (>= 1.0.11) rspec (>= 2.7.0) - builder (3.0.3) + builder (3.0.4) capybara (1.1.2) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -54,6 +54,7 @@ GEM xpath (~> 0.1.4) childprocess (0.3.5) ffi (~> 1.0, >= 1.0.6) + concurrent-ruby (1.1.6) cucumber (1.2.1) builder (>= 2.1.2) diff-lcs (>= 1.1.3) @@ -74,10 +75,11 @@ GEM ffi (1.1.5) gherkin (2.11.2) json (>= 1.4.6) - hike (1.2.1) - i18n (0.6.1) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) - json (1.7.5) + json (2.3.1) libwebsocket (0.1.5) addressable mail (2.4.4) @@ -85,15 +87,15 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.19) - multi_json (1.3.6) + multi_json (1.15.0) nokogiri (1.5.5) polyglot (0.3.3) - rack (1.4.1) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.12.0) rack (>= 0.4) - rack-ssl (1.3.2) + rack-ssl (1.3.4) rack - rack-test (0.6.1) + rack-test (0.6.3) rack (>= 1.0) railties (3.2.8) actionpack (= 3.2.8) @@ -103,8 +105,7 @@ GEM rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) rake (0.9.2.2) - rdoc (3.12) - json (~> 1.4) + rdoc (3.9.5) rspec (2.11.0) rspec-core (~> 2.11.0) rspec-expectations (~> 2.11.0) @@ -132,14 +133,14 @@ GEM activesupport (~> 3.0) railties (~> 3.0) slim (~> 1.0) - sprockets (2.1.3) + sprockets (2.1.4) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.6) temple (0.4.1) - thor (0.16.0) - tilt (1.3.3) + thor (1.0.1) + tilt (1.3.7) treetop (1.4.11) polyglot polyglot (>= 0.3.1)