diff --git a/Gemfile.lock b/Gemfile.lock index 79a1618..b486cdf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,6 +38,7 @@ GEM childprocess (0.3.8) ffi (~> 1.0, >= 1.0.11) columnize (0.3.6) + concurrent-ruby (1.1.5) daemons (1.1.9) debugger (1.3.1) columnize (>= 0.3.1) @@ -52,8 +53,9 @@ GEM execjs (1.4.0) multi_json (~> 1.0) ffi (1.3.1) - hike (1.2.1) - i18n (0.6.1) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jasmine (1.3.1) jasmine-core (~> 1.3.1) rack (~> 1.0) @@ -61,10 +63,10 @@ GEM selenium-webdriver (>= 0.1.3) jasmine-core (1.3.1) journey (1.0.4) - jquery-rails (2.2.1) + jquery-rails (3.1.3) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.7.7) + json (1.8.6) libv8 (3.11.8.13) log4r (1.1.10) mail (2.4.4) @@ -72,7 +74,7 @@ GEM mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.21) - multi_json (1.5.1) + multi_json (1.14.0) mysql2 (0.3.11) net-ssh (2.3.0) nokogiri (1.5.6) @@ -84,16 +86,16 @@ GEM rails (~> 3.1) resque (~> 1.20.0) resque-result (~> 1.0.1) - rack (1.4.5) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.9.0) rack (>= 0.4) rack-maintenance_mode (0.0.4) rack (>= 1.0.0) rack-protection (1.3.2) rack - rack-ssl (1.3.3) + rack-ssl (1.3.4) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rails (3.2.12) actionmailer (= 3.2.12) @@ -110,8 +112,8 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.0.3) - rdoc (3.12.1) + rake (13.0.0) + rdoc (3.12.2) json (~> 1.4) redis (2.2.2) redis-namespace (1.0.3) @@ -145,7 +147,7 @@ GEM rack (~> 1.4) rack-protection (~> 1.3) tilt (~> 1.3, >= 1.3.3) - sprockets (2.2.2) + sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) @@ -157,8 +159,8 @@ GEM daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.17.0) - tilt (1.3.3) + thor (0.20.3) + tilt (1.4.1) treetop (1.4.12) polyglot polyglot (>= 0.3.1)