diff --git a/Gemfile.lock b/Gemfile.lock index c42adbf..dc34dec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -56,6 +56,7 @@ GEM coffee-script-source execjs coffee-script-source (1.4.0) + concurrent-ruby (1.1.5) cucumber (1.2.1) builder (>= 2.1.2) diff-lcs (>= 1.1.3) @@ -92,13 +93,14 @@ GEM childprocess (>= 0.2.3) guard (>= 1.1) spork (>= 0.8.4) - hike (1.2.1) - i18n (0.6.1) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) - jquery-rails (2.1.4) + jquery-rails (3.1.3) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.7.6) + json (2.2.0) libwebsocket (0.1.7.1) addressable websocket @@ -110,7 +112,7 @@ GEM treetop (~> 1.4.8) method_source (0.8.1) mime-types (1.19) - multi_json (1.5.0) + multi_json (1.14.0) nokogiri (1.5.6) pg (0.12.2) polyglot (0.3.3) @@ -118,12 +120,12 @@ GEM coderay (~> 1.0.5) method_source (~> 0.8) slop (~> 3.3.1) - rack (1.4.3) - 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.2) + rack-test (0.6.3) rack (>= 1.0) rails (3.2.11) actionmailer (= 3.2.11) @@ -140,10 +142,9 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.0.3) + rake (13.0.0) rb-fsevent (0.9.3) - rdoc (3.12) - json (~> 1.4) + rdoc (3.9.5) rspec (2.10.0) rspec-core (~> 2.10.0) rspec-expectations (~> 2.10.0) @@ -170,14 +171,14 @@ GEM rubyzip slop (3.3.3) spork (0.9.2) - sprockets (2.2.2) + sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.5) - thor (0.16.0) - tilt (1.3.3) + thor (0.20.3) + tilt (1.4.1) treetop (1.4.12) polyglot polyglot (>= 0.3.1)