diff --git a/Gemfile b/Gemfile index 8d16a4f..ef312af 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' group :test, :development do diff --git a/Gemfile.lock b/Gemfile.lock index 7a95130..9f0580d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,30 +1,78 @@ 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) columnize (0.3.4) + concurrent-ruby (1.1.10) + erubis (2.7.0) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + journey (1.0.4) + json (1.8.6) 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) - rack (1.1.2) - 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) + 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) rbx-require-relative (0.0.5) + rdoc (3.12.2) + json (~> 1.4) rspec (1.3.0) rspec-rails (1.3.2) rack (>= 1.0.0) @@ -34,13 +82,24 @@ GEM ruby-debug-base (~> 0.10.4.0) ruby-debug-base (0.10.4) linecache (>= 0.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 DEPENDENCIES mysql (= 2.8.1) - rails (= 2.3.11) + rails (= 3.2.17) rspec (= 1.3.0) rspec-rails (= 1.3.2) ruby-debug