diff --git a/store-after/Gemfile b/store-after/Gemfile index f0c5fc0..d96328c 100644 --- a/store-after/Gemfile +++ b/store-after/Gemfile @@ -1,6 +1,6 @@ source 'http://rubygems.org' -gem 'rails', '3.1.0.rc1' +gem 'rails', '3.2.17' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' diff --git a/store-after/Gemfile.lock b/store-after/Gemfile.lock index 4f43e7a..650852a 100644 --- a/store-after/Gemfile.lock +++ b/store-after/Gemfile.lock @@ -1,96 +1,98 @@ GEM remote: http://rubygems.org/ specs: - actionmailer (3.1.0.rc1) - actionpack (= 3.1.0.rc1) - mail (~> 2.3.0) - actionpack (3.1.0.rc1) - activemodel (= 3.1.0.rc1) - activesupport (= 3.1.0.rc1) + 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) - i18n (~> 0.6.0beta1) - rack (~> 1.3.0.beta2) - rack-cache (~> 1.0.1) - rack-mount (~> 0.8.1) - rack-test (~> 0.6.0) - sprockets (~> 2.0.0.beta.5) - tzinfo (~> 0.3.27) - activemodel (3.1.0.rc1) - activesupport (= 3.1.0.rc1) - bcrypt-ruby (~> 2.1.4) + 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) - i18n (~> 0.6.0beta1) - activerecord (3.1.0.rc1) - activemodel (= 3.1.0.rc1) - activesupport (= 3.1.0.rc1) - arel (~> 2.1.1) - tzinfo (~> 0.3.27) - activeresource (3.1.0.rc1) - activemodel (= 3.1.0.rc1) - activesupport (= 3.1.0.rc1) - activesupport (3.1.0.rc1) + 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) ansi (1.2.5) - arel (2.1.1) - bcrypt-ruby (2.1.4) - builder (3.0.0) + arel (3.0.3) + builder (3.0.4) coffee-script (2.2.0) coffee-script-source execjs coffee-script-source (1.1.1) + concurrent-ruby (1.1.5) erubis (2.7.0) execjs (1.0.0) multi_json (~> 1.0) - hike (1.0.0) - i18n (0.6.0) + hike (1.2.3) + i18n (0.9.5) + concurrent-ruby (~> 1.0) + journey (1.0.4) jquery-rails (1.0.7) railties (~> 3.0) thor (~> 0.14) - mail (2.3.0) - i18n (>= 0.4.0) + json (1.8.6) + mail (2.5.5) mime-types (~> 1.16) treetop (~> 1.4.8) - mime-types (1.16) - multi_json (1.0.2) - polyglot (0.3.1) - rack (1.3.0.beta2) - rack-cache (1.0.2) + mime-types (1.25.1) + multi_json (1.14.1) + polyglot (0.3.5) + rack (1.4.7) + rack-cache (1.9.0) rack (>= 0.4) - rack-mount (0.8.1) - rack (>= 1.0.0) - rack-ssl (1.3.2) + rack-ssl (1.3.4) rack - rack-test (0.6.0) + rack-test (0.6.3) rack (>= 1.0) - rails (3.1.0.rc1) - actionmailer (= 3.1.0.rc1) - actionpack (= 3.1.0.rc1) - activerecord (= 3.1.0.rc1) - activeresource (= 3.1.0.rc1) - activesupport (= 3.1.0.rc1) + 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.1.0.rc1) - railties (3.1.0.rc1) - actionpack (= 3.1.0.rc1) - activesupport (= 3.1.0.rc1) + 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) - thor (~> 0.14.6) - rake (0.9.0) + rdoc (~> 3.4) + thor (>= 0.14.6, < 2.0) + rake (13.0.0) + rdoc (3.12.2) + json (~> 1.4) sass (3.1.1) - sprockets (2.0.0.beta.8) - hike (~> 1.0) + sprockets (2.2.3) + hike (~> 1.2) + multi_json (~> 1.0) rack (~> 1.0) - tilt (!= 1.3.0, ~> 1.1) + tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.3) - thor (0.14.6) - tilt (1.3.1) - treetop (1.4.9) + thor (0.20.3) + tilt (1.4.1) + treetop (1.4.15) + polyglot polyglot (>= 0.3.1) turn (0.8.2) ansi (>= 1.2.2) - tzinfo (0.3.27) + tzinfo (0.3.55) uglifier (0.5.4) execjs (>= 0.3.0) multi_json (>= 1.0.2) @@ -101,7 +103,7 @@ PLATFORMS DEPENDENCIES coffee-script jquery-rails - rails (= 3.1.0.rc1) + rails (= 3.2.17) sass sqlite3 turn