Permalink
Browse files

Merge pull request #114 from alphagov/rails-3-2-16-upgrade

rails security upgrade
  • Loading branch information...
2 parents be9a615 + 8a34b8a commit 9b2ff41289eee43e74725eb663bc192f114e3487 @alext alext committed Dec 4, 2013
Showing with 32 additions and 32 deletions.
  1. +1 −1 Gemfile
  2. +31 −31 Gemfile.lock
View
2 Gemfile
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
source 'https://BnrJb6FZyzspBboNJzYZ@gem.fury.io/govuk/'
-gem 'rails', '3.2.14'
+gem 'rails', '3.2.16'
group :assets do
gem 'less-rails-bootstrap', '2.1.1'
View
62 Gemfile.lock
@@ -23,35 +23,35 @@ GEM
remote: https://rubygems.org/
remote: https://BnrJb6FZyzspBboNJzYZ@gem.fury.io/govuk/
specs:
- actionmailer (3.2.14)
- actionpack (= 3.2.14)
+ actionmailer (3.2.16)
+ actionpack (= 3.2.16)
mail (~> 2.5.4)
- actionpack (3.2.14)
- activemodel (= 3.2.14)
- activesupport (= 3.2.14)
+ actionpack (3.2.16)
+ activemodel (= 3.2.16)
+ activesupport (= 3.2.16)
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.14)
- activesupport (= 3.2.14)
+ activemodel (3.2.16)
+ activesupport (= 3.2.16)
builder (~> 3.0.0)
- activerecord (3.2.14)
- activemodel (= 3.2.14)
- activesupport (= 3.2.14)
+ activerecord (3.2.16)
+ activemodel (= 3.2.16)
+ activesupport (= 3.2.16)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.14)
- activemodel (= 3.2.14)
- activesupport (= 3.2.14)
- activesupport (3.2.14)
+ 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)
@@ -115,7 +115,7 @@ GEM
hike (1.2.3)
http_parser.rb (0.5.3)
httpauth (0.2.0)
- i18n (0.6.4)
+ i18n (0.6.9)
inflection (1.0.0)
journey (1.0.4)
jquery-rails (2.1.3)
@@ -147,10 +147,10 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
- mime-types (1.23)
+ mime-types (1.25.1)
mocha (0.13.3)
metaclass (~> 0.0.1)
- multi_json (1.7.7)
+ multi_json (1.8.2)
multi_test (0.0.2)
multipart-post (1.2.0)
mysql2 (0.3.14)
@@ -190,17 +190,17 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.14)
- actionmailer (= 3.2.14)
- actionpack (= 3.2.14)
- activerecord (= 3.2.14)
- activeresource (= 3.2.14)
- activesupport (= 3.2.14)
+ 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.14)
- railties (3.2.14)
- actionpack (= 3.2.14)
- activesupport (= 3.2.14)
+ 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)
@@ -246,10 +246,10 @@ GEM
tilt (1.4.1)
timeliness (0.3.7)
timers (1.1.0)
- treetop (1.4.14)
+ 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)
@@ -298,7 +298,7 @@ DEPENDENCIES
plek (= 1.1.0)
poltergeist (= 0.7.0)
quiet_assets (= 1.0.2)
- rails (= 3.2.14)
+ rails (= 3.2.16)
redis-activesupport (= 3.2.3)!
redis-namespace (= 1.3.1)
redis-rails (= 3.2.3)

0 comments on commit 9b2ff41

Please sign in to comment.