[DRE-commits] [rails] 01/03: Merge tag 'upstream/4.2.5.2'

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository rails.

commit 609617f0037aaa83de7eee61a9428ed3a9c120b7
Merge: 5ea6d5f c3b0a45
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Wed Mar 2 11:48:58 2016 -0300

    Merge tag 'upstream/4.2.5.2'
    
    Upstream version 4.2.5.2
    
    # gpg: Signature made Qua 02 Mar 2016 11:48:58 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>"

 Gemfile.lock                                    | 58 ++++++++++++-------------
 RAILS_VERSION                                   |  2 +-
 actionmailer/CHANGELOG.md                       | 10 +++++
 actionmailer/lib/action_mailer/gem_version.rb   |  2 +-
 actionpack/CHANGELOG.md                         | 14 ++++++
 actionpack/lib/abstract_controller/rendering.rb | 10 ++---
 actionpack/lib/action_pack/gem_version.rb       |  2 +-
 actionpack/test/controller/render_test.rb       | 52 +++++++++++++++++++++-
 actionview/CHANGELOG.md                         | 17 ++++++++
 actionview/lib/action_view/gem_version.rb       |  2 +-
 actionview/lib/action_view/renderer/renderer.rb |  4 ++
 actionview/lib/action_view/template/resolver.rb |  4 +-
 actionview/test/template/render_test.rb         | 19 ++++++++
 actionview/test/template/text_helper_test.rb    |  6 +--
 activejob/CHANGELOG.md                          | 10 +++++
 activejob/lib/active_job/gem_version.rb         |  2 +-
 activemodel/CHANGELOG.md                        | 10 +++++
 activemodel/lib/active_model/gem_version.rb     |  2 +-
 activerecord/CHANGELOG.md                       | 10 +++++
 activerecord/lib/active_record/gem_version.rb   |  2 +-
 activesupport/CHANGELOG.md                      | 10 +++++
 activesupport/lib/active_support/gem_version.rb |  2 +-
 guides/CHANGELOG.md                             | 10 +++++
 railties/CHANGELOG.md                           | 10 +++++
 railties/lib/rails/gem_version.rb               |  2 +-
 version.rb                                      |  2 +-
 26 files changed, 224 insertions(+), 50 deletions(-)

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