diff --git a/Gemfile.lock b/Gemfile.lock index 4c2ccfa2c..0c76fd048 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -44,6 +44,7 @@ GEM coffee-script-source execjs coffee-script-source (1.6.3) + concurrent-ruby (1.1.6) coveralls (0.6.9) multi_json (~> 1.3) rest-client @@ -59,25 +60,25 @@ GEM factory_girl (4.2.0) activesupport (>= 3.0.0) hike (1.2.3) - i18n (0.7.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) journey (1.0.4) jquery-rails (3.0.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.3) - mail (2.4.4) - i18n (>= 0.4.0) + mail (2.5.5) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) mini_portile (0.5.1) - multi_json (1.11.0) + multi_json (1.14.1) nokogiri (1.6.0) mini_portile (~> 0.5.0) pg (0.15.1) polyglot (0.3.5) - rack (1.4.5) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.9.0) rack (>= 0.4) rack-ssl (1.3.4) rack @@ -98,7 +99,7 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.4.2) + rake (13.0.1) rdoc (3.12.2) json (~> 1.4) rest-client (1.6.7)