diff --git a/Gemfile.lock b/Gemfile.lock index 0c0dc63..738fb28 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,7 +36,7 @@ GEM multi_json (~> 1.0) addressable (2.2.8) arel (3.0.2) - builder (3.0.0) + builder (3.0.4) capybara (1.1.2) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -46,6 +46,7 @@ GEM xpath (~> 0.1.4) childprocess (0.3.2) ffi (~> 1.0.6) + concurrent-ruby (1.2.2) cucumber (1.2.0) builder (>= 2.1.2) diff-lcs (>= 1.1.3) @@ -61,13 +62,14 @@ GEM ffi (1.0.11) gherkin (2.10.0) json (>= 1.4.6) - hike (1.2.1) - i18n (0.6.0) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) - jquery-rails (2.0.2) - railties (>= 3.2.0, < 5.0) - thor (~> 0.14) - json (1.7.3) + jquery-rails (3.1.5) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (2.6.3) libwebsocket (0.1.3) addressable mail (2.4.4) @@ -75,16 +77,16 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.18) - multi_json (1.3.6) + multi_json (1.15.0) mysql2 (0.3.11) nokogiri (1.5.4) polyglot (0.3.3) - rack (1.4.1) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.13.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) rails (3.2.6) actionmailer (= 3.2.6) @@ -101,9 +103,8 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (0.9.2.2) - rdoc (3.12) - json (~> 1.4) + rake (13.0.6) + rdoc (3.9.5) rspec (2.9.0) rspec-core (~> 2.9.0) rspec-expectations (~> 2.9.0) @@ -124,12 +125,12 @@ GEM libwebsocket (~> 0.1.3) multi_json (~> 1.0) rubyzip - sprockets (2.1.3) + sprockets (2.1.4) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - thor (0.15.3) - tilt (1.3.3) + thor (1.2.1) + tilt (1.4.1) treetop (1.4.10) polyglot polyglot (>= 0.3.1)