diff --git a/Gemfile b/Gemfile index 5e3f2cd3..a4b21ae7 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '2.3.11' +gem 'rails', '3.2.17' gem 'mysql', '2.8.1' gem "json", '1.1.3' diff --git a/Gemfile.lock b/Gemfile.lock index 227ade7c..c68eb089 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,18 +1,37 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (2.3.11) - actionpack (= 2.3.11) - actionpack (2.3.11) - activesupport (= 2.3.11) - rack (~> 1.1.0) - activerecord (2.3.11) - activesupport (= 2.3.11) - activeresource (2.3.11) - activesupport (= 2.3.11) - activesupport (2.3.11) - builder (2.1.2) + actionmailer (3.2.17) + actionpack (= 3.2.17) + mail (~> 2.5.4) + actionpack (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) + builder (~> 3.0.0) + erubis (~> 2.7.0) + journey (~> 1.0.4) + rack (~> 1.4.5) + rack-cache (~> 1.2) + rack-test (~> 0.6.1) + sprockets (~> 2.2.1) + activemodel (3.2.17) + activesupport (= 3.2.17) + builder (~> 3.0.0) + activerecord (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) + arel (~> 3.0.2) + tzinfo (~> 0.3.29) + activeresource (3.2.17) + activemodel (= 3.2.17) + activesupport (= 3.2.17) + activesupport (3.2.17) + i18n (~> 0.6, >= 0.6.4) + multi_json (~> 1.0) + arel (3.0.3) + builder (3.0.4) columnize (0.3.4) + concurrent-ruby (1.1.10) crypt-isaac (0.9.1) cucumber (0.3.1) builder (>= 2.1.2) @@ -21,28 +40,53 @@ GEM term-ansicolor (>= 1.0.3) treetop (>= 1.2.5) diff-lcs (1.1.2) + erubis (2.7.0) highline (1.4.0) + hike (1.2.3) hpricot (0.6.161) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + journey (1.0.4) json (1.1.3) linecache (0.46) rbx-require-relative (> 0.0.4) + mail (2.5.5) + mime-types (~> 1.16) + treetop (~> 1.4.8) + mime-types (1.25.1) + multi_json (1.15.0) mysql (2.8.1) nokogiri (1.2.3) parseexcel (0.5.2) polyglot (0.3.1) - rack (1.1.2) + rack (1.4.7) + rack-cache (1.13.0) + rack (>= 0.4) rack-debug (1.4.2) rack (>= 1.0) ruby-debug (>= 0.10) - rails (2.3.11) - actionmailer (= 2.3.11) - actionpack (= 2.3.11) - activerecord (= 2.3.11) - activeresource (= 2.3.11) - activesupport (= 2.3.11) - rake (>= 0.8.3) - rake (0.9.2) + rack-ssl (1.3.4) + rack + rack-test (0.6.3) + rack (>= 1.0) + rails (3.2.17) + actionmailer (= 3.2.17) + actionpack (= 3.2.17) + activerecord (= 3.2.17) + activeresource (= 3.2.17) + activesupport (= 3.2.17) + bundler (~> 1.0) + railties (= 3.2.17) + railties (3.2.17) + actionpack (= 3.2.17) + activesupport (= 3.2.17) + rack-ssl (~> 1.3.2) + rake (>= 0.8.7) + rdoc (~> 3.4) + thor (>= 0.14.6, < 2.0) + rake (13.0.6) rbx-require-relative (0.0.5) + rdoc (3.9.5) rest-client (0.8.2) rspec (1.3.0) rspec-rails (1.3.2) @@ -56,9 +100,17 @@ GEM rubycas-client (2.1.0) activesupport spork (0.8.4) + sprockets (2.2.3) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) term-ansicolor (1.0.5) + thor (1.2.1) + tilt (1.4.1) treetop (1.4.8) polyglot (>= 0.3.1) + tzinfo (0.3.60) validatable (1.6.7) PLATFORMS @@ -74,7 +126,7 @@ DEPENDENCIES nokogiri (= 1.2.3) parseexcel (= 0.5.2) rack-debug (= 1.4.2) - rails (= 2.3.11) + rails (= 3.2.17) rest-client (= 0.8.2) rspec (= 1.3.0) rspec-rails (= 1.3.2)