diff --git a/rubyweb/Gemfile b/rubyweb/Gemfile index 3c17c67..b4b15a7 100644 --- a/rubyweb/Gemfile +++ b/rubyweb/Gemfile @@ -26,7 +26,7 @@ gem 'jquery-rails' # gem 'memcache-client', '1.8.5' # gem 'colorize', '0.5.8' gem 'zmq', "2.1.3" -gem 'json', '1.5.3' +gem 'json', '2.3.1' gem 'activeadmin', "0.3" gem 'meta_search', '>= 1.1.0.pre' diff --git a/rubyweb/Gemfile.lock b/rubyweb/Gemfile.lock index d7a40ab..38df562 100644 --- a/rubyweb/Gemfile.lock +++ b/rubyweb/Gemfile.lock @@ -41,7 +41,7 @@ GEM multi_json (~> 1.0) arel (2.2.1) bcrypt-ruby (3.0.1) - builder (3.0.0) + builder (3.0.4) chunky_png (1.2.5) coffee-filter (0.1.1) coffee-script (>= 2.2.0) @@ -52,11 +52,12 @@ GEM coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.1.3) + coffee-script-source (1.12.2) compass (0.11.5) chunky_png (~> 1.2) fssm (>= 0.2.7) sass (~> 3.1) + concurrent-ruby (1.1.6) devise (1.4.9) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.0.3) @@ -70,15 +71,16 @@ GEM fssm (0.2.7) haml (3.1.3) has_scope (0.5.1) - hike (1.2.1) - i18n (0.6.0) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) inherited_resources (1.3.0) has_scope (~> 0.5.0) responders (~> 0.6.0) jquery-rails (1.0.17) railties (~> 3.0) thor (~> 0.14) - json (1.5.3) + json (2.3.1) kaminari (0.12.4) rails (>= 3.0.0) kgio (2.6.0) @@ -93,20 +95,20 @@ GEM activesupport (~> 3.1.0) polyamorous (~> 0.5.0) mime-types (1.17.2) - multi_json (1.0.3) + multi_json (1.15.0) mysql2 (0.3.7) orm_adapter (0.0.5) polyamorous (0.5.0) activerecord (~> 3.0) polyglot (0.3.3) - rack (1.3.5) + rack (1.3.10) rack-cache (1.0.3) rack (>= 0.4) rack-mount (0.8.3) rack (>= 1.0.0) - rack-ssl (1.3.2) + rack-ssl (1.3.4) rack - rack-test (0.6.1) + rack-test (0.6.3) rack (>= 1.0) rails (3.1.0) actionmailer (= 3.1.0) @@ -124,9 +126,8 @@ GEM rdoc (~> 3.4) thor (~> 0.14.6) raindrops (0.8.0) - rake (0.9.2.2) - rdoc (3.11) - json (~> 1.4) + rake (13.0.1) + rdoc (3.9.5) responders (0.6.4) sass (3.1.10) sass-rails (3.1.4) @@ -135,7 +136,7 @@ GEM sass (>= 3.1.4) sprockets (~> 2.0.0) tilt (~> 1.3.2) - sprockets (2.0.3) + sprockets (2.0.5) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) @@ -143,7 +144,7 @@ GEM therubyracer (0.9.4) libv8 (~> 3.3.10) thor (0.14.6) - tilt (1.3.3) + tilt (1.3.7) treetop (1.4.10) polyglot polyglot (>= 0.3.1) @@ -169,7 +170,7 @@ DEPENDENCIES compass (>= 0.11.5) haml jquery-rails - json (= 1.5.3) + json (= 2.3.1) meta_search (>= 1.1.0.pre) mysql2 rails (= 3.1)