From d7e7cb46878f9e563399cd5e4a84003b15c53e42 Mon Sep 17 00:00:00 2001 From: Alex Tomlins Date: Wed, 4 Dec 2013 10:12:45 +0000 Subject: [PATCH] Bump Rails to 3.2.16 --- Gemfile | 2 +- Gemfile.lock | 79 ++++++++++++++++++++++++++-------------------------- 2 files changed, 40 insertions(+), 41 deletions(-) diff --git a/Gemfile b/Gemfile index d5e147667..aba833eeb 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' source 'https://BnrJb6FZyzspBboNJzYZ@gem.fury.io/govuk/' -gem 'rails', '3.2.13' +gem 'rails', '3.2.16' gem 'unicorn', '4.3.1' gem 'aws-ses', :require => 'aws/ses' # Needed by exception_notification diff --git a/Gemfile.lock b/Gemfile.lock index 0040bad54..16093e23b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,12 +3,12 @@ GEM remote: https://BnrJb6FZyzspBboNJzYZ@gem.fury.io/govuk/ specs: PriorityQueue (0.1.2) - actionmailer (3.2.13) - actionpack (= 3.2.13) - mail (~> 2.5.3) - actionpack (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) + actionmailer (3.2.16) + actionpack (= 3.2.16) + mail (~> 2.5.4) + actionpack (3.2.16) + activemodel (= 3.2.16) + activesupport (= 3.2.16) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -16,22 +16,22 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.13) - activesupport (= 3.2.13) + activemodel (3.2.16) + activesupport (= 3.2.16) builder (~> 3.0.0) - activerecord (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) + activerecord (3.2.16) + activemodel (= 3.2.16) + activesupport (= 3.2.16) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.13) - activemodel (= 3.2.13) - activesupport (= 3.2.13) - activesupport (3.2.13) - i18n (= 0.6.1) + activeresource (3.2.16) + activemodel (= 3.2.16) + activesupport (= 3.2.16) + activesupport (3.2.16) + i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) addressable (2.3.2) - arel (3.0.2) + arel (3.0.3) aws-ses (0.4.4) builder mail (> 2.2.5) @@ -64,8 +64,8 @@ GEM sass (>= 3.2.0) govuk_template (0.2.1) rails (>= 3.1) - hike (1.2.1) - i18n (0.6.1) + hike (1.2.3) + i18n (0.6.9) jasmine (1.1.2) jasmine-core (>= 1.1.0) rack (>= 1.1) @@ -73,7 +73,7 @@ GEM selenium-webdriver (>= 0.1.3) jasmine-core (1.1.0) journey (1.0.4) - json (1.7.7) + json (1.8.1) kgio (2.7.4) libv8 (3.16.14.3) libwebsocket (0.1.5) @@ -84,16 +84,15 @@ GEM activesupport lrucache (0.1.4) PriorityQueue (~> 0.1.2) - mail (2.5.3) - i18n (>= 0.4.0) + mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) metaclass (0.0.1) - mime-types (1.21) + mime-types (1.25.1) mini_portile (0.5.1) mocha (0.13.3) metaclass (~> 0.0.1) - multi_json (1.7.1) + multi_json (1.8.2) nokogiri (1.6.0) mini_portile (~> 0.5.0) null_logger (0.0.1) @@ -106,23 +105,23 @@ GEM rack rack-test (0.6.2) rack (>= 1.0) - rails (3.2.13) - actionmailer (= 3.2.13) - actionpack (= 3.2.13) - activerecord (= 3.2.13) - activeresource (= 3.2.13) - activesupport (= 3.2.13) + rails (3.2.16) + actionmailer (= 3.2.16) + actionpack (= 3.2.16) + activerecord (= 3.2.16) + activeresource (= 3.2.16) + activesupport (= 3.2.16) bundler (~> 1.0) - railties (= 3.2.13) - railties (3.2.13) - actionpack (= 3.2.13) - activesupport (= 3.2.13) + railties (= 3.2.16) + railties (3.2.16) + actionpack (= 3.2.16) + activesupport (= 3.2.16) 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) + rake (10.1.0) rdoc (3.12.2) json (~> 1.4) ref (1.0.5) @@ -156,12 +155,12 @@ GEM therubyracer (0.12.0) libv8 (~> 3.16.14.0) ref - thor (0.17.0) - tilt (1.3.6) - treetop (1.4.12) + thor (0.18.1) + tilt (1.4.1) + treetop (1.4.15) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.37) + tzinfo (0.3.38) uglifier (1.3.0) execjs (>= 0.3.0) multi_json (~> 1.0, >= 1.0.2) @@ -187,7 +186,7 @@ DEPENDENCIES lograge (~> 0.1.0) mocha (= 0.13.3) plek (= 1.5.0) - rails (= 3.2.13) + rails (= 3.2.16) sass (= 3.2.0) sass-rails (= 3.2.5) shoulda (= 2.11.3)