diff --git a/Gemfile.lock b/Gemfile.lock index 182a315..e17784a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -77,12 +77,11 @@ GEM ffi2-generators (0.1.1) hike (1.2.3) i18n (0.6.9) + jar-dependencies (0.4.1) jdbc-sqlite3 (3.7.2.1) jquery-rails (3.1.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.1) - json (1.8.1-java) libv8 (3.16.14.3) mail (2.5.4) mime-types (~> 1.16) @@ -98,6 +97,10 @@ GEM mono_logger (1.1.0) multi_json (1.8.4) polyglot (0.3.4) + psych (5.1.0) + stringio + psych (5.1.0-java) + jar-dependencies (>= 0.1.7) racc (1.4.10) rack (1.5.2) rack-protection (1.5.2) @@ -118,8 +121,8 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.1.1) - rdoc (4.0.1) - json (~> 1.4) + rdoc (6.5.0) + psych (>= 4.0.0) redcard (1.1.0) redis (3.0.7) redis-namespace (1.4.1) @@ -355,6 +358,7 @@ GEM activesupport (>= 3.0) sprockets (~> 2.8) sqlite3 (1.3.8) + stringio (3.0.7) therubyracer (0.12.1) libv8 (~> 3.16.14.0) ref