diff --git a/Gemfile b/Gemfile index 237f51e..012da87 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gem 'paperclip', '2.3.3' gem 'populator', '1.0.0' gem 'pg' gem 'prawn', '0.6.3' -gem 'rails', '2.3.18' +gem 'rails', '3.2.17' gem 'rake', '0.8.7' gem 'searchlogic', '2.4.25' gem 'will_paginate', '2.3.15' diff --git a/Gemfile.lock b/Gemfile.lock index ed13103..2d5ec1c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,25 +1,57 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (2.3.18) - actionpack (= 2.3.18) - actionpack (2.3.18) - activesupport (= 2.3.18) - rack (~> 1.1.0) - activerecord (2.3.18) - activesupport (= 2.3.18) - activeresource (2.3.18) - activesupport (= 2.3.18) - activesupport (2.3.18) + 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 (2.1.6) activesupport + builder (3.0.4) + concurrent-ruby (1.1.10) + erubis (2.7.0) factory_girl (2.3.2) activesupport faker (0.3.1) + 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.25.1) + multi_json (1.15.0) paperclip (2.3.3) activerecord activesupport pg (0.17.1) + polyglot (0.3.5) populator (1.0.0) prawn (0.6.3) prawn-core (>= 0.6.3, < 0.7) @@ -31,17 +63,44 @@ GEM prawn-core prawn-layout (0.3.2) prawn-security (0.1.1) - rack (1.1.6) - rails (2.3.18) - actionmailer (= 2.3.18) - actionpack (= 2.3.18) - activerecord (= 2.3.18) - activeresource (= 2.3.18) - activesupport (= 2.3.18) - rake (>= 0.8.3) + 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 (0.8.7) + rdoc (3.12.2) + json (~> 1.4) searchlogic (2.4.25) activerecord (>= 2.0.0) + 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) will_paginate (2.3.15) PLATFORMS @@ -55,7 +114,7 @@ DEPENDENCIES pg populator (= 1.0.0) prawn (= 0.6.3) - rails (= 2.3.18) + rails (= 3.2.17) rake (= 0.8.7) searchlogic (= 2.4.25) will_paginate (= 2.3.15)