diff --git a/Gemfile b/Gemfile index 15961cb..cd915f0 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source "http://rubygems.org" gem 'sinatra', "~>1.0" -gem 'activerecord', "~>2.3.15" +gem 'activerecord', "~>3.2.22" group :development do gem "mysql", "~> 2.8.1" diff --git a/Gemfile.lock b/Gemfile.lock index a1543db..338b170 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,15 +1,28 @@ GEM remote: http://rubygems.org/ specs: - activerecord (2.3.15) - activesupport (= 2.3.15) + activemodel (3.2.22.1) + activesupport (= 3.2.22.1) + builder (~> 3.0.0) + activerecord (3.2.22.1) + activemodel (= 3.2.22.1) + activesupport (= 3.2.22.1) + arel (~> 3.0.2) + tzinfo (~> 0.3.29) activerecord-oracle_enhanced-adapter (1.2.3) activerecord (>= 2.0.0) - activesupport (2.3.15) + activesupport (3.2.22.1) + i18n (~> 0.6, >= 0.6.4) + multi_json (~> 1.0) + arel (3.0.3) + builder (3.0.4) cgi_multipart_eof_fix (2.5.0) + concurrent-ruby (1.1.5) daemons (1.1.0) fastthread (1.0.7) gem_plugin (0.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) mongrel (1.1) cgi_multipart_eof_fix (>= 2.4) daemons (>= 1.0.3) @@ -20,17 +33,19 @@ GEM mongrel (>= 1.0.2) mongrel_experimental (1.1) mongrel (= 1.1) + multi_json (1.14.1) mysql (2.8.1) rack (1.2.1) ruby-oci8 (2.1.5) sinatra (1.0) rack (>= 1.0) + tzinfo (0.3.56) PLATFORMS ruby DEPENDENCIES - activerecord (~> 2.3.15) + activerecord (~> 3.2.22) activerecord-oracle_enhanced-adapter (= 1.2.3) mongrel_cluster mongrel_experimental