From e04f5660cc602a0a8a575b6ee85b0819ea204eed Mon Sep 17 00:00:00 2001 From: Skud Date: Tue, 19 Mar 2013 15:09:56 +1100 Subject: [PATCH] upgrade rails to 3.2.13 - security patch --- Gemfile | 2 +- Gemfile.lock | 99 ++++++++++++++++++++++++++-------------------------- 2 files changed, 50 insertions(+), 51 deletions(-) diff --git a/Gemfile b/Gemfile index 8c9a8cb97..b3b26d9a6 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' gem 'bundler', '>=1.1.5' -gem 'rails', '3.2.12' +gem 'rails', '3.2.13' gem 'rack', '~>1.4.5' gem 'json', '~>1.7.7' gem 'haml' diff --git a/Gemfile.lock b/Gemfile.lock index d89315651..c25cdb2e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.12) - actionpack (= 3.2.12) - mail (~> 2.4.4) - actionpack (3.2.12) - activemodel (= 3.2.12) - activesupport (= 3.2.12) + actionmailer (3.2.13) + actionpack (= 3.2.13) + mail (~> 2.5.3) + actionpack (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -14,19 +14,19 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.12) - activesupport (= 3.2.12) + activemodel (3.2.13) + activesupport (= 3.2.13) builder (~> 3.0.0) - activerecord (3.2.12) - activemodel (= 3.2.12) - activesupport (= 3.2.12) + activerecord (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.12) - activemodel (= 3.2.12) - activesupport (= 3.2.12) - activesupport (3.2.12) - i18n (~> 0.6) + activeresource (3.2.13) + activemodel (= 3.2.13) + activesupport (= 3.2.13) + activesupport (3.2.13) + i18n (= 0.6.1) multi_json (~> 1.0) arel (3.0.2) bcrypt-ruby (3.0.1) @@ -49,7 +49,7 @@ GEM coffee-script (2.2.0) coffee-script-source execjs - coffee-script-source (1.4.0) + coffee-script-source (1.6.1) columnize (0.3.6) commonjs (0.2.6) compass (0.12.2) @@ -58,15 +58,14 @@ GEM sass (~> 3.1) compass-rails (1.0.3) compass (>= 0.12.2, < 0.14) - daemon_controller (1.1.1) + daemon_controller (1.1.2) daemons (1.1.9) - debugger (1.3.1) + debugger (1.5.0) columnize (>= 0.3.1) - debugger-linecache (~> 1.1.1) - debugger-ruby_core_source (~> 1.1.8) - debugger-linecache (1.1.2) - debugger-ruby_core_source (>= 1.1.1) - debugger-ruby_core_source (1.1.8) + debugger-linecache (~> 1.2.0) + debugger-ruby_core_source (~> 1.2.0) + debugger-linecache (1.2.0) + debugger-ruby_core_source (1.2.0) devise (2.2.3) bcrypt-ruby (~> 3.0) orm_adapter (~> 0.1) @@ -74,7 +73,7 @@ GEM warden (~> 1.2.1) diff-lcs (1.1.3) erubis (2.7.0) - eventmachine (1.0.0) + eventmachine (1.0.3) execjs (1.4.0) multi_json (~> 1.0) factory_girl (4.2.0) @@ -94,7 +93,7 @@ GEM activesupport (>= 3.1, < 4.1) haml (>= 3.1, < 4.1) railties (>= 3.1, < 4.1) - highline (1.6.15) + highline (1.6.16) hike (1.2.1) i18n (0.6.1) journey (1.0.4) @@ -103,26 +102,26 @@ GEM thor (>= 0.14, < 2.0) json (1.7.7) kgio (2.8.0) - less (2.2.2) + less (2.3.1) commonjs (~> 0.2.6) - less-rails (2.2.6) + less-rails (2.3.2) actionpack (>= 3.1) - less (~> 2.2.0) + less (~> 2.3.1) libv8 (3.3.10.4) - mail (2.4.4) + mail (2.5.3) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.21) - multi_json (1.6.1) + multi_json (1.7.1) net-scp (1.1.0) net-ssh (>= 2.6.5) net-sftp (2.1.1) net-ssh (>= 2.6.5) - net-ssh (2.6.5) + net-ssh (2.6.6) net-ssh-gateway (1.2.0) net-ssh (>= 2.6.5) - nokogiri (1.5.6) + nokogiri (1.5.7) orm_adapter (0.4.0) passenger (3.0.19) daemon_controller (>= 1.0.0) @@ -138,24 +137,24 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.12) - actionmailer (= 3.2.12) - actionpack (= 3.2.12) - activerecord (= 3.2.12) - activeresource (= 3.2.12) - activesupport (= 3.2.12) + rails (3.2.13) + actionmailer (= 3.2.13) + actionpack (= 3.2.13) + activerecord (= 3.2.13) + activeresource (= 3.2.13) + activesupport (= 3.2.13) bundler (~> 1.0) - railties (= 3.2.12) - railties (3.2.12) - actionpack (= 3.2.12) - activesupport (= 3.2.12) + railties (= 3.2.13) + railties (3.2.13) + actionpack (= 3.2.13) + activesupport (= 3.2.13) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) raindrops (0.10.0) rake (10.0.3) - rdoc (3.12.1) + rdoc (3.12.2) json (~> 1.4) rspec-core (2.12.2) rspec-expectations (2.12.1) @@ -170,7 +169,7 @@ GEM rspec-mocks (~> 2.12.0) rvm-capistrano (1.2.7) capistrano (>= 2.0.0) - sass (3.2.5) + sass (3.2.7) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) @@ -183,20 +182,20 @@ GEM sqlite3 (1.3.7) therubyracer (0.10.2) libv8 (~> 3.3.10) - thin (1.5.0) + thin (1.5.1) daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) thor (0.17.0) - tilt (1.3.3) + tilt (1.3.6) treetop (1.4.12) polyglot polyglot (>= 0.3.1) - twitter-bootstrap-rails (2.2.4) + twitter-bootstrap-rails (2.2.6) actionpack (>= 3.1) execjs railties (>= 3.1) - tzinfo (0.3.35) + tzinfo (0.3.37) uglifier (1.3.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) @@ -239,7 +238,7 @@ DEPENDENCIES passenger pg rack (~> 1.4.5) - rails (= 3.2.12) + rails (= 3.2.13) rake (>= 10.0.0) rspec-rails (~> 2.12.1) rvm-capistrano