[DRE-commits] [rails] 01/02: Merge tag 'upstream/4.2.5.1'

[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 77a1e53986a46624f7dd1178e6dc6adb4c3cd197
Merge: abb1549 14e5038
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Jan 28 10:55:41 2016 -0200

    Merge tag 'upstream/4.2.5.1'
    
    Upstream version 4.2.5.1
    
    # gpg: Signature made Qui 28 Jan 2016 10:55:38 BRST 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>"

 RAILS_VERSION                                      |  2 +-
 actionmailer/lib/action_mailer/gem_version.rb      |  2 +-
 actionpack/lib/abstract_controller/rendering.rb    |  8 +++++-
 .../action_controller/metal/http_authentication.rb |  7 ++++-
 actionpack/lib/action_dispatch/http/mime_type.rb   | 18 +++++++++++--
 .../lib/action_dispatch/routing/route_set.rb       |  4 +--
 actionpack/lib/action_pack/gem_version.rb          |  2 +-
 actionpack/test/controller/render_test.rb          | 31 ++++++++++++++++++++++
 actionview/lib/action_view/gem_version.rb          |  2 +-
 actionview/lib/action_view/lookup_context.rb       |  4 +++
 actionview/lib/action_view/path_set.rb             | 26 +++++++++++++-----
 .../lib/action_view/renderer/abstract_renderer.rb  |  2 +-
 .../lib/action_view/renderer/template_renderer.rb  |  2 +-
 actionview/lib/action_view/template/resolver.rb    | 25 ++++++++++++++---
 actionview/lib/action_view/testing/resolvers.rb    |  4 +--
 actionview/test/template/render_test.rb            |  7 +++++
 activejob/lib/active_job/gem_version.rb            |  2 +-
 activemodel/lib/active_model/gem_version.rb        |  2 +-
 activemodel/lib/active_model/serializers/json.rb   |  2 +-
 activemodel/lib/active_model/validations.rb        |  3 ++-
 activerecord/lib/active_record/enum.rb             |  2 +-
 activerecord/lib/active_record/gem_version.rb      |  2 +-
 .../lib/active_record/nested_attributes.rb         | 14 ++++++++--
 activerecord/lib/active_record/reflection.rb       |  4 +--
 activerecord/test/cases/nested_attributes_test.rb  | 13 +++++++++
 activesupport/lib/active_support/callbacks.rb      |  2 +-
 activesupport/lib/active_support/gem_version.rb    |  2 +-
 activesupport/lib/active_support/security_utils.rb |  7 +++++
 railties/lib/rails/gem_version.rb                  |  2 +-
 version.rb                                         |  2 +-
 30 files changed, 165 insertions(+), 40 deletions(-)

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