diff --git a/aphrodite/Gemfile.lock b/aphrodite/Gemfile.lock index fc65532e..b1a624e3 100644 --- a/aphrodite/Gemfile.lock +++ b/aphrodite/Gemfile.lock @@ -81,6 +81,7 @@ GEM sass (~> 3.1) compass-rails (1.0.3) compass (>= 0.12.2, < 0.14) + concurrent-ruby (1.1.5) database_cleaner (1.2.0) debug_inspector (0.0.2) devise (2.2.3) @@ -127,15 +128,16 @@ GEM hashr (0.0.22) highline (1.6.19) hike (1.2.3) - i18n (0.6.11) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) - jquery-rails (3.0.4) + jquery-rails (3.1.5) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) jquery-ui-rails (3.0.1) jquery-rails railties (>= 3.1.0) - json (1.8.1) + json (1.8.6) kaminari (0.14.1) actionpack (>= 3.0.0) activesupport (>= 3.0.0) @@ -170,7 +172,7 @@ GEM mongoid mono_logger (1.1.0) moped (1.5.1) - multi_json (1.10.1) + multi_json (1.14.0) multipart-post (2.0.0) nested_form (0.3.2) net-scp (1.1.2) @@ -188,8 +190,8 @@ GEM polyglot (0.3.5) rabl (0.8.0) activesupport (>= 2.3.14) - rack (1.4.5) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.9.0) rack (>= 0.4) rack-pjax (0.7.0) nokogiri (~> 1.5) @@ -198,7 +200,7 @@ GEM rack rack-ssl (1.3.4) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) rails (3.2.19) actionmailer (= 3.2.19) @@ -231,7 +233,7 @@ GEM rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) raindrops (0.13.0) - rake (10.3.2) + rake (13.0.0) rdoc (3.12.2) json (~> 1.4) redis (3.1.0) @@ -267,12 +269,12 @@ GEM rack-protection (~> 1.4) tilt (~> 1.3, >= 1.3.4) spring (0.0.10) - sprockets (2.2.2) + sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - thor (0.19.1) + thor (0.20.3) tilt (1.4.1) tire (0.6.0) activemodel (>= 3.0)