[DRE-commits] [rails] 02/03: Merge tag 'upstream/4.2.7.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 db2e5fea374dbc7ebfad105fb1914a8da70bfe57
Merge: f6d9c5b c56d62c
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Aug 20 10:55:18 2016 -0300

    Merge tag 'upstream/4.2.7.1'
    
    Upstream version 4.2.7.1
    
    # gpg: Signature made Sáb 20 Ago 2016 10:55:18 BRT using RSA key ID FC0DB1BBCD460BDE
    # gpg: Good signature from "Antonio Terceiro <terceiro at softwarelivre.org>" [ultimate]
    # gpg:                 aka "Antonio Terceiro <terceiro at dcc.ufba.br>" [ultimate]
    # gpg:                 aka "Antonio Terceiro <terceiro at colivre.coop.br>" [ultimate]
    # gpg:                 aka "Antonio Terceiro <terceiro at debian.org>" [ultimate]
    # gpg:                 aka "Antonio Terceiro <antonio.terceiro at linaro.org>" [ultimate]
    # gpg:                 aka "Antonio Terceiro <antonio.terceiro at linaro.org>" [ultimate]

 .travis.yml                                        |   4 +
 Gemfile                                            |   5 +-
 Gemfile.lock                                       | 171 +++++++++++----------
 RAILS_VERSION                                      |   2 +-
 actionmailer/CHANGELOG.md                          |   8 +
 actionmailer/lib/action_mailer/delivery_methods.rb |   2 +-
 actionmailer/lib/action_mailer/gem_version.rb      |   4 +-
 actionmailer/lib/action_mailer/test_case.rb        |   3 +-
 actionmailer/test/delivery_methods_test.rb         |   2 +-
 actionmailer/test/test_case_test.rb                |  17 ++
 actionpack/CHANGELOG.md                            |   5 +
 actionpack/lib/action_pack/gem_version.rb          |   4 +-
 .../dispatch/request/json_params_parsing_test.rb   |  43 ++++++
 actionview/CHANGELOG.md                            |   5 +
 actionview/lib/action_view/gem_version.rb          |   4 +-
 actionview/lib/action_view/helpers/tag_helper.rb   |   2 +-
 actionview/test/template/tag_helper_test.rb        |  10 ++
 activejob/CHANGELOG.md                             |   5 +
 activejob/lib/active_job/gem_version.rb            |   4 +-
 activejob/lib/active_job/logging.rb                |   2 +-
 activejob/test/cases/logging_test.rb               |   7 +-
 activejob/test/jobs/overridden_logging_job.rb      |   9 ++
 activemodel/CHANGELOG.md                           |   5 +
 activemodel/lib/active_model/gem_version.rb        |   4 +-
 activerecord/CHANGELOG.md                          |  35 +++++
 activerecord/lib/active_record/aggregations.rb     |   7 +-
 .../lib/active_record/attribute_methods.rb         |  10 +-
 .../connection_adapters/abstract_adapter.rb        |  12 ++
 .../connection_adapters/abstract_mysql_adapter.rb  |  12 +-
 .../connection_adapters/mysql2_adapter.rb          |   2 +-
 .../postgresql/schema_statements.rb                |   2 +-
 .../connection_adapters/sqlite3_adapter.rb         |  12 --
 activerecord/lib/active_record/gem_version.rb      |   4 +-
 .../lib/active_record/relation/calculations.rb     |   9 +-
 .../relation/predicate_builder/array_handler.rb    |   3 +-
 .../lib/active_record/tasks/database_tasks.rb      |   1 +
 .../active_record/tasks/mysql_database_tasks.rb    |  22 +--
 activerecord/lib/active_record/type/date.rb        |   4 +
 activerecord/lib/active_record/type/decimal.rb     |  12 +-
 .../test/cases/adapters/mysql2/quoting_test.rb     |  21 +++
 .../test/cases/adapters/postgresql/array_test.rb   |   7 +-
 .../test/cases/adapters/sqlite3/quoting_test.rb    |   2 +-
 activerecord/test/cases/aggregations_test.rb       |   5 +
 activerecord/test/cases/attribute_methods_test.rb  |  23 ++-
 activerecord/test/cases/calculations_test.rb       |  13 ++
 .../cases/{invalid_date_test.rb => date_test.rb}   |  14 +-
 activerecord/test/cases/helper.rb                  |   5 +-
 .../test/cases/tasks/database_tasks_test.rb        |  15 +-
 activerecord/test/cases/tasks/mysql_rake_test.rb   |  11 +-
 activerecord/test/cases/type/decimal_test.rb       |   7 +
 activerecord/test/models/customer.rb               |   7 +-
 activesupport/CHANGELOG.md                         |  30 ++++
 .../lib/active_support/core_ext/marshal.rb         |   9 +-
 activesupport/lib/active_support/gem_version.rb    |   4 +-
 .../lib/active_support/inflector/methods.rb        |   2 +-
 activesupport/lib/active_support/logger.rb         |  25 +++
 activesupport/lib/active_support/logger_silence.rb |  28 +---
 .../lib/active_support/logger_thread_safe_level.rb |  32 ++++
 .../lib/active_support/values/time_zone.rb         |   4 +-
 activesupport/lib/active_support/xml_mini/rexml.rb |   4 +-
 activesupport/test/broadcast_logger_test.rb        | 134 ++++++++++++----
 activesupport/test/core_ext/marshal_test.rb        |  36 ++++-
 activesupport/test/inflector_test_cases.rb         |   3 +-
 activesupport/test/logger_test.rb                  |  46 ++++++
 activesupport/test/time_zone_test.rb               |  11 ++
 activesupport/test/xml_mini/rexml_engine_test.rb   |  25 ++-
 guides/CHANGELOG.md                                |   7 +-
 guides/source/association_basics.md                |   2 +-
 guides/source/layouts_and_rendering.md             |  17 +-
 railties/CHANGELOG.md                              |  13 +-
 railties/lib/rails/gem_version.rb                  |   4 +-
 railties/lib/rails/generators/app_base.rb          |   7 +
 .../generators/rails/plugin/plugin_generator.rb    |   2 +-
 railties/test/generators/app_generator_test.rb     |  40 +++--
 railties/test/generators/plugin_generator_test.rb  |  33 +++-
 railties/test/generators/shared_generator_tests.rb |  22 ---
 tasks/release.rb                                   |   2 +-
 version.rb                                         |   4 +-
 78 files changed, 866 insertions(+), 284 deletions(-)

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