diff --git a/Gemfile.lock b/Gemfile.lock index c050fac..76c6606 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -30,7 +30,7 @@ GEM multi_json (~> 1.0) addressable (2.3.2) arel (3.0.2) - builder (3.0.0) + builder (3.0.4) capybara (1.1.2) mime-types (>= 1.16) nokogiri (>= 1.3.3) @@ -47,6 +47,7 @@ GEM coffee-script-source execjs coffee-script-source (1.3.3) + concurrent-ruby (1.1.5) crack (0.3.1) cucumber (1.2.1) builder (>= 2.1.2) @@ -75,13 +76,14 @@ GEM nokogiri (>= 1.4.4) happymapper (0.4.0) libxml-ruby (~> 2.0) - 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.4) + jquery-rails (3.1.3) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + json (2.2.0) libwebsocket (0.1.5) addressable libxml-ruby (2.3.3) @@ -93,26 +95,23 @@ GEM mime-types (1.19) mocha (0.11.4) metaclass (~> 0.0.1) - multi_json (1.3.6) + multi_json (1.14.1) mysql2 (0.3.11) nifty-generators (0.4.6) nokogiri (1.5.5) pivotal-tracker (0.5.4) builder - builder - happymapper (>= 0.3.2) happymapper (>= 0.3.2) nokogiri (>= 1.4.3) nokogiri (~> 1.4) rest-client (~> 1.6.0) - rest-client (~> 1.6.0) polyglot (0.3.3) - rack (1.4.1) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.9.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.3) actionmailer (= 3.2.3) @@ -130,8 +129,7 @@ GEM rdoc (~> 3.4) thor (~> 0.14.6) rake (0.9.2.2) - rdoc (3.12) - json (~> 1.4) + rdoc (3.9.5) rest-client (1.6.7) mime-types (>= 1.16) rspec (2.11.0) @@ -164,12 +162,12 @@ GEM simplecov-html (0.5.3) simplecov-rcov (0.2.3) simplecov (>= 0.4.1) - sprockets (2.1.3) + sprockets (2.1.4) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) thor (0.14.6) - tilt (1.3.3) + tilt (1.4.1) treetop (1.4.10) polyglot polyglot (>= 0.3.1)