[DRE-commits] [rails-3.2] 02/03: Merge tag 'upstream/3.2.19'

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository rails-3.2.

commit 2a1ce5c978e83a6f1e473e8430e281c57e392130
Merge: 0415766 d6f32d7
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Jul 17 14:38:17 2014 -0300

    Merge tag 'upstream/3.2.19'
    
    Upstream version 3.2.19
    
    # gpg: Signature made Qui 17 Jul 2014 14:38:14 BRT using RSA key ID CD460BDE
    # gpg: Good signature from "Antonio Terceiro <terceiro at softwarelivre.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at dcc.ufba.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at colivre.coop.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at debian.org>"
    # gpg:                 aka "Antonio Terceiro <antonio.terceiro at linaro.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at cs.ubc.ca>"

 RAILS_VERSION                                      |  2 +-
 actionmailer/CHANGELOG.md                          |  5 ++++
 actionmailer/lib/action_mailer/version.rb          |  2 +-
 actionpack/CHANGELOG.md                            | 10 ++++++++
 .../lib/action_controller/metal/force_ssl.rb       |  2 +-
 actionpack/lib/action_pack/version.rb              |  2 +-
 .../lib/action_view/helpers/number_helper.rb       |  8 +++----
 .../lib/action_view/helpers/translation_helper.rb  | 10 +++++++-
 actionpack/lib/action_view/template/resolver.rb    | 28 ++++++++++++++++------
 .../test/template/translation_helper_test.rb       |  6 +++++
 activemodel/CHANGELOG.md                           |  5 ++++
 activemodel/lib/active_model/version.rb            |  2 +-
 activerecord/CHANGELOG.md                          |  9 +++++++
 .../connection_adapters/postgresql_adapter.rb      |  6 ++---
 activerecord/lib/active_record/session_store.rb    |  2 +-
 activerecord/lib/active_record/version.rb          |  2 +-
 .../test/cases/adapters/postgresql/quoting_test.rb |  5 ++++
 activeresource/CHANGELOG.md                        |  5 ++++
 activeresource/lib/active_resource/version.rb      |  2 +-
 activesupport/CHANGELOG.md                         | 10 ++++++++
 activesupport/lib/active_support/railtie.rb        |  7 ++++++
 activesupport/lib/active_support/version.rb        |  2 +-
 railties/CHANGELOG.md                              |  5 ++++
 railties/lib/rails/version.rb                      |  2 +-
 railties/test/application/configuration_test.rb    | 12 ++++++++++
 version.rb                                         |  2 +-
 26 files changed, 127 insertions(+), 26 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/rails-3.2.git