diff --git a/Gemfile b/Gemfile index 0a3e394..312c37d 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '3.0.9' +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 957d65e..69b8c41 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,88 +1,101 @@ GEM remote: http://rubygems.org/ specs: - abstract (1.0.0) - actionmailer (3.0.9) - actionpack (= 3.0.9) - mail (~> 2.2.19) - actionpack (3.0.9) - activemodel (= 3.0.9) - activesupport (= 3.0.9) - builder (~> 2.1.2) - erubis (~> 2.6.6) - i18n (~> 0.5.0) - rack (~> 1.2.1) - rack-mount (~> 0.6.14) - rack-test (~> 0.5.7) - tzinfo (~> 0.3.23) - activemodel (3.0.9) - activesupport (= 3.0.9) - builder (~> 2.1.2) - i18n (~> 0.5.0) - activerecord (3.0.9) - activemodel (= 3.0.9) - activesupport (= 3.0.9) - arel (~> 2.0.10) - tzinfo (~> 0.3.23) - activeresource (3.0.9) - activemodel (= 3.0.9) - activesupport (= 3.0.9) - activesupport (3.0.9) - arel (2.0.10) + 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) authlogic (3.0.3) activerecord (>= 3.0.7) - activerecord (>= 3.0.7) - builder (2.1.2) + builder (3.0.4) cocaine (0.1.0) + concurrent-ruby (1.1.5) daemons (1.1.4) - erubis (2.6.6) - abstract (>= 1.0.0) + erubis (2.7.0) eventmachine (0.12.10) - i18n (0.5.0) - mail (2.2.19) - activesupport (>= 2.3.6) - i18n (>= 0.4.0) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + journey (1.0.4) + json (1.8.6) + mail (2.5.5) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.16) + mime-types (1.25.1) + multi_json (1.14.1) mysql2 (0.2.7) paperclip (2.3.15) activerecord (>= 2.3.0) activesupport (>= 2.3.2) cocaine (>= 0.0.2) mime-types - polyglot (0.3.1) - rack (1.2.3) - rack-mount (0.6.14) - rack (>= 1.0.0) - rack-test (0.5.7) + polyglot (0.3.5) + rack (1.4.7) + rack-cache (1.10.0) + rack (>= 0.4) + rack-ssl (1.3.4) + rack + rack-test (0.6.3) rack (>= 1.0) - rails (3.0.9) - actionmailer (= 3.0.9) - actionpack (= 3.0.9) - activerecord (= 3.0.9) - activeresource (= 3.0.9) - activesupport (= 3.0.9) + 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.0.9) + railties (= 3.2.17) rails3-generators (0.17.4) railties (>= 3.0.0) - railties (3.0.9) - actionpack (= 3.0.9) - activesupport (= 3.0.9) + 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.4) - rake (0.9.2) - rdoc (3.6.1) + thor (>= 0.14.6, < 2.0) + rake (13.0.0) + rdoc (3.12.2) + json (~> 1.4) + sprockets (2.2.3) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) thin (1.2.11) daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.14.6) - treetop (1.4.9) + thor (0.20.3) + tilt (1.4.1) + treetop (1.4.15) + polyglot polyglot (>= 0.3.1) - tzinfo (0.3.28) + tzinfo (0.3.56) will_paginate (3.0.pre2) PLATFORMS @@ -92,7 +105,7 @@ DEPENDENCIES authlogic mysql2 (= 0.2.7) paperclip - rails (= 3.0.9) + rails (= 3.2.17) rails3-generators thin will_paginate (~> 3.0.beta)