diff --git a/Gemfile b/Gemfile index cf79a13..9ca4dd3 100644 --- a/Gemfile +++ b/Gemfile @@ -7,6 +7,6 @@ group :development do gem "bundler", "~> 1.0.0" gem "jeweler", "~> 1.6.4" gem "rcov", ">= 0" - gem "rails", "2.3.11" + gem "rails", "3.2.17" end diff --git a/Gemfile.lock b/Gemfile.lock index 7db52d4..3b7716f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,32 +1,91 @@ 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) + 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) + concurrent-ruby (1.1.10) + erubis (2.7.0) git (1.2.5) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) jeweler (1.6.4) bundler (~> 1.0) git (>= 1.2.5) rake - rack (1.1.6) - 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 (13.0.0) + journey (1.0.4) + json (1.8.6) + mail (2.5.5) + mime-types (~> 1.16) + treetop (~> 1.4.8) + mime-types (1.25.1) + multi_json (1.15.0) + polyglot (0.3.5) + rack (1.4.7) + rack-cache (1.13.0) + rack (>= 0.4) + 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) rcov (0.9.10) + rdoc (3.12.2) + json (~> 1.4) shoulda (2.11.3) + sprockets (2.2.3) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) + thor (1.2.1) + tilt (1.4.1) + treetop (1.4.15) + polyglot + polyglot (>= 0.3.1) + tzinfo (0.3.60) PLATFORMS ruby @@ -34,6 +93,6 @@ PLATFORMS DEPENDENCIES bundler (~> 1.0.0) jeweler (~> 1.6.4) - rails (= 2.3.11) + rails (= 3.2.17) rcov shoulda diff --git a/woulda.gemspec b/woulda.gemspec index 84b6296..f5b14f9 100644 --- a/woulda.gemspec +++ b/woulda.gemspec @@ -71,20 +71,20 @@ Gem::Specification.new do |s| s.add_development_dependency(%q, ["~> 1.0.0"]) s.add_development_dependency(%q, ["~> 1.6.4"]) s.add_development_dependency(%q, [">= 0"]) - s.add_development_dependency(%q, "= 2.3.11") + s.add_development_dependency(%q, "= 3.2.17") else s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, ["~> 1.0.0"]) s.add_dependency(%q, ["~> 1.6.4"]) s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, "= 2.3.11") + s.add_dependency(%q, "= 3.2.17") end else s.add_dependency(%q, [">= 0"]) s.add_dependency(%q, ["~> 1.0.0"]) s.add_dependency(%q, ["~> 1.6.4"]) s.add_dependency(%q, [">= 0"]) - s.add_dependency(%q, "= 2.3.11") + s.add_dependency(%q, "= 3.2.17") end end