Skip to content

Commit

Permalink
Merge pull request #374 from alphagov/rails-3-2-17
Browse files Browse the repository at this point in the history
Upgrade to Rails 3.2.17
  • Loading branch information
alext committed Feb 24, 2014
2 parents b6877a8 + 172089b commit 0c1e201
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 29 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.16'
gem 'rails', '3.2.17'
gem 'unicorn', '4.3.1'

gem 'aws-ses', :require => 'aws/ses' # Needed by exception_notification
Expand Down
56 changes: 28 additions & 28 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.16)
actionpack (= 3.2.16)
actionmailer (3.2.17)
actionpack (= 3.2.17)
mail (~> 2.5.4)
actionpack (3.2.16)
activemodel (= 3.2.16)
activesupport (= 3.2.16)
actionpack (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
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.16)
activesupport (= 3.2.16)
activemodel (3.2.17)
activesupport (= 3.2.17)
builder (~> 3.0.0)
activerecord (3.2.16)
activemodel (= 3.2.16)
activesupport (= 3.2.16)
activerecord (3.2.17)
activemodel (= 3.2.17)
activesupport (= 3.2.17)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.16)
activemodel (= 3.2.16)
activesupport (= 3.2.16)
activesupport (3.2.16)
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)
addressable (2.3.2)
Expand Down Expand Up @@ -91,36 +91,36 @@ GEM
mini_portile (0.5.1)
mocha (0.13.3)
metaclass (~> 0.0.1)
multi_json (1.8.2)
multi_json (1.8.4)
nokogiri (1.6.0)
mini_portile (~> 0.5.0)
null_logger (0.0.1)
plek (1.7.0)
polyglot (0.3.3)
polyglot (0.3.4)
rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (3.2.16)
actionmailer (= 3.2.16)
actionpack (= 3.2.16)
activerecord (= 3.2.16)
activeresource (= 3.2.16)
activesupport (= 3.2.16)
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.2.16)
railties (3.2.16)
actionpack (= 3.2.16)
activesupport (= 3.2.16)
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)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
raindrops (0.10.0)
rake (10.1.0)
rake (10.1.1)
rdoc (3.12.2)
json (~> 1.4)
ref (1.0.5)
Expand Down Expand Up @@ -185,7 +185,7 @@ DEPENDENCIES
logstasher (= 0.4.8)
mocha (= 0.13.3)
plek (= 1.7.0)
rails (= 3.2.16)
rails (= 3.2.17)
sass (= 3.2.1)
sass-rails (= 3.2.5)
shoulda (= 2.11.3)
Expand Down

0 comments on commit 0c1e201

Please sign in to comment.