diff --git a/Gemfile b/Gemfile index 5e3f2cd3..66ec49e9 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'http://rubygems.org' gem 'rails', '2.3.11' gem 'mysql', '2.8.1' -gem "json", '1.1.3' +gem "json", '2.3.0' gem "parseexcel",'0.5.2' gem "rest-client", '0.8.2', :require => "rest_client" gem "hpricot",'0.6.161' diff --git a/Gemfile.lock b/Gemfile.lock index 227ade7c..ce4c4fd3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -23,7 +23,7 @@ GEM diff-lcs (1.1.2) highline (1.4.0) hpricot (0.6.161) - json (1.1.3) + json (2.3.0) linecache (0.46) rbx-require-relative (> 0.0.4) mysql (2.8.1) @@ -69,7 +69,7 @@ DEPENDENCIES cucumber (= 0.3.1) highline (= 1.4.0) hpricot (= 0.6.161) - json (= 1.1.3) + json (= 2.3.0) mysql (= 2.8.1) nokogiri (= 1.2.3) parseexcel (= 0.5.2)