Skip to content

Commit

Permalink
Merge pull request #604 from alphagov/bump-gems
Browse files Browse the repository at this point in the history
Bump Rails and Rack for security issues
  • Loading branch information
bradwright committed Jun 17, 2015
2 parents 6232383 + 6a7102c commit a71ef59
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

gem 'rails', '3.2.18'
gem 'rails', '3.2.22'
gem 'unicorn', '4.3.1'

gem 'aws-ses', :require => 'aws/ses' # Needed by exception_notification
Expand Down
60 changes: 30 additions & 30 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,31 @@ GEM
remote: https://rubygems.org/
specs:
PriorityQueue (0.1.2)
actionmailer (3.2.18)
actionpack (= 3.2.18)
actionmailer (3.2.22)
actionpack (= 3.2.22)
mail (~> 2.5.4)
actionpack (3.2.18)
activemodel (= 3.2.18)
activesupport (= 3.2.18)
actionpack (3.2.22)
activemodel (= 3.2.22)
activesupport (= 3.2.22)
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.18)
activesupport (= 3.2.18)
activemodel (3.2.22)
activesupport (= 3.2.22)
builder (~> 3.0.0)
activerecord (3.2.18)
activemodel (= 3.2.18)
activesupport (= 3.2.18)
activerecord (3.2.22)
activemodel (= 3.2.22)
activesupport (= 3.2.22)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.18)
activemodel (= 3.2.18)
activesupport (= 3.2.18)
activesupport (3.2.18)
activeresource (3.2.22)
activemodel (= 3.2.22)
activesupport (= 3.2.22)
activesupport (3.2.22)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
arel (3.0.3)
Expand Down Expand Up @@ -77,7 +77,7 @@ GEM
railties (>= 3.2.0)
sprockets-rails
journey (1.0.4)
json (1.8.2)
json (1.8.3)
kgio (2.7.4)
libv8 (3.16.14.7)
link_header (0.0.7)
Expand All @@ -94,35 +94,35 @@ GEM
mini_portile (0.5.1)
mocha (0.13.3)
metaclass (~> 0.0.1)
multi_json (1.11.0)
multi_json (1.11.1)
nokogiri (1.6.0)
mini_portile (~> 0.5.0)
null_logger (0.0.1)
phantomjs (1.9.8.0)
plek (1.7.0)
polyglot (0.3.4)
polyglot (0.3.5)
progress (3.0.1)
quiet_assets (1.1.0)
railties (>= 3.1, < 5.0)
rack (1.4.5)
rack (1.4.6)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.4)
rack
rack-test (0.6.3)
rack (>= 1.0)
rack_strip_client_ip (0.0.1)
rails (3.2.18)
actionmailer (= 3.2.18)
actionpack (= 3.2.18)
activerecord (= 3.2.18)
activeresource (= 3.2.18)
activesupport (= 3.2.18)
rails (3.2.22)
actionmailer (= 3.2.22)
actionpack (= 3.2.22)
activerecord (= 3.2.22)
activeresource (= 3.2.22)
activesupport (= 3.2.22)
bundler (~> 1.0)
railties (= 3.2.18)
railties (3.2.18)
actionpack (= 3.2.18)
activesupport (= 3.2.18)
railties (= 3.2.22)
railties (3.2.22)
actionpack (= 3.2.22)
activesupport (= 3.2.22)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
Expand Down Expand Up @@ -155,7 +155,7 @@ GEM
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.39)
tzinfo (0.3.44)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
Expand Down Expand Up @@ -184,7 +184,7 @@ DEPENDENCIES
plek (= 1.7.0)
quiet_assets (= 1.1.0)
rack_strip_client_ip (= 0.0.1)
rails (= 3.2.18)
rails (= 3.2.22)
sass (= 3.4.2)
sass-rails (= 3.2.5)
shoulda (= 2.11.3)
Expand Down

0 comments on commit a71ef59

Please sign in to comment.