diff --git a/Gemfile b/Gemfile index afec1f8a..d34e76bc 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem "rails", "3.0.1" +gem "rails", "3.2.17" # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' diff --git a/Gemfile.lock b/Gemfile.lock index 1a3664cc..a528d7cc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,74 +1,83 @@ GEM remote: http://rubygems.org/ specs: - abstract (1.0.0) - actionmailer (3.0.1) - actionpack (= 3.0.1) - mail (~> 2.2.5) - actionpack (3.0.1) - activemodel (= 3.0.1) - activesupport (= 3.0.1) - builder (~> 2.1.2) - erubis (~> 2.6.6) - i18n (~> 0.4.1) - rack (~> 1.2.1) - rack-mount (~> 0.6.12) - rack-test (~> 0.5.4) - tzinfo (~> 0.3.23) - activemodel (3.0.1) - activesupport (= 3.0.1) - builder (~> 2.1.2) - i18n (~> 0.4.1) - activerecord (3.0.1) - activemodel (= 3.0.1) - activesupport (= 3.0.1) - arel (~> 1.0.0) - tzinfo (~> 0.3.23) - activeresource (3.0.1) - activemodel (= 3.0.1) - activesupport (= 3.0.1) - activesupport (3.0.1) - arel (1.0.1) - activesupport (~> 3.0.0) - 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) + concurrent-ruby (1.1.10) daemons (1.0.10) delayed_job (2.0.3) daemons diff-lcs (1.1.2) - erubis (2.6.6) - abstract (>= 1.0.0) + erubis (2.7.0) faker (0.3.1) haml (3.0.18) - i18n (0.4.1) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + journey (1.0.4) + json (1.8.6) machinist (1.0.6) - mail (2.2.7) - activesupport (>= 2.3.6) - mime-types - treetop (>= 1.4.5) - mime-types (1.16) + 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.4.3.1) - polyglot (0.3.1) - rack (1.2.1) - rack-mount (0.6.13) - rack (>= 1.0.0) - rack-test (0.5.4) + 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.0.1) - actionmailer (= 3.0.1) - actionpack (= 3.0.1) - activerecord (= 3.0.1) - activeresource (= 3.0.1) - activesupport (= 3.0.1) - bundler (~> 1.0.0) - railties (= 3.0.1) - railties (3.0.1) - actionpack (= 3.0.1) - activesupport (= 3.0.1) - rake (>= 0.8.4) - thor (~> 0.14.0) - rake (0.8.7) + 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.8) + rdoc (3.12.2) + json (~> 1.4) rspec (2.0.0) rspec-core (= 2.0.0) rspec-expectations (= 2.0.0) @@ -81,10 +90,17 @@ GEM rspec-expectations (= 2.0.0) rspec-rails (2.0.1) rspec (~> 2.0.0) - thor (0.14.3) - treetop (1.4.8) + 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.23) + tzinfo (0.3.60) webrat (0.7.1) nokogiri (>= 1.2.0) rack (>= 1.0) @@ -100,7 +116,7 @@ DEPENDENCIES haml (~> 3.0.18) machinist (~> 1.0.6) mysql - rails (= 3.0.1) + rails (= 3.2.17) rcov (~> 0.9.8) rspec-rails (~> 2.0.1) webrat (~> 0.7.1)