[DRE-commits] [rails] 05/09: Merge tag 'upstream/4.1.8'

[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 da924ab924c687b6556a9c531d5c51fd98bf017a
Merge: 5e9ff24 ee1dd1e
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Tue Nov 25 16:17:18 2014 -0200

    Merge tag 'upstream/4.1.8'
    
    Upstream version 4.1.8

 RAILS_VERSION                                      |  2 +-
 actionmailer/CHANGELOG.md                          |  6 ++
 actionmailer/lib/action_mailer/base.rb             |  3 +-
 actionmailer/lib/action_mailer/gem_version.rb      |  2 +-
 actionmailer/lib/action_mailer/mail_helper.rb      |  2 +-
 actionmailer/test/base_test.rb                     | 13 ++++
 .../late_inline_attachment_mailer/on_render.erb    |  7 ++
 actionpack/CHANGELOG.md                            | 13 ++++
 actionpack/lib/action_dispatch/http/request.rb     |  2 +-
 .../lib/action_dispatch/journey/formatter.rb       |  2 +-
 actionpack/lib/action_dispatch/journey/router.rb   |  6 +-
 .../middleware/exception_wrapper.rb                | 21 ++---
 .../middleware/public_exceptions.rb                |  6 +-
 .../lib/action_dispatch/middleware/static.rb       |  4 +-
 .../action_dispatch/testing/assertions/routing.rb  | 16 ++--
 actionpack/lib/action_pack/gem_version.rb          |  2 +-
 actionpack/test/controller/integration_test.rb     |  8 ++
 actionpack/test/dispatch/request_test.rb           | 16 ++++
 .../test/dispatch/routing_assertions_test.rb       | 16 ++++
 actionpack/test/dispatch/show_exceptions_test.rb   |  8 +-
 actionpack/test/dispatch/static_test.rb            | 41 ++++++++++
 actionpack/test/journey/router_test.rb             | 10 +++
 actionview/CHANGELOG.md                            |  7 ++
 actionview/lib/action_view/gem_version.rb          |  2 +-
 .../lib/action_view/helpers/form_tag_helper.rb     | 14 +++-
 .../lib/action_view/helpers/sanitize_helper.rb     | 16 ++--
 actionview/lib/action_view/helpers/tags/base.rb    |  2 +-
 .../lib/action_view/helpers/translation_helper.rb  |  1 +
 actionview/test/template/form_helper_test.rb       | 14 ++++
 actionview/test/template/form_tag_helper_test.rb   |  6 ++
 .../test/template/translation_helper_test.rb       |  1 -
 activemodel/lib/active_model/gem_version.rb        |  2 +-
 activerecord/CHANGELOG.md                          | 38 +++++++++
 .../associations/through_association.rb            |  6 +-
 .../lib/active_record/attribute_methods.rb         |  6 +-
 .../connection_adapters/abstract/quoting.rb        |  7 +-
 .../connection_adapters/abstract_mysql_adapter.rb  | 14 +++-
 .../connection_adapters/mysql2_adapter.rb          |  4 +-
 .../connection_adapters/mysql_adapter.rb           |  6 +-
 .../postgresql/schema_statements.rb                |  4 +-
 .../lib/active_record/connection_handling.rb       |  2 +-
 activerecord/lib/active_record/core.rb             |  2 -
 activerecord/lib/active_record/fixtures.rb         | 12 +--
 activerecord/lib/active_record/gem_version.rb      |  2 +-
 activerecord/lib/active_record/migration.rb        |  2 +-
 activerecord/lib/active_record/persistence.rb      |  4 +-
 .../lib/active_record/railties/databases.rake      | 14 +---
 .../lib/active_record/relation/query_methods.rb    |  7 ++
 .../lib/active_record/tasks/database_tasks.rb      | 18 ++++-
 .../active_record/tasks/mysql_database_tasks.rb    |  2 +-
 .../active_record/tasks/sqlite_database_tasks.rb   |  6 +-
 .../test/cases/adapters/mysql/connection_test.rb   |  7 +-
 .../test/cases/adapters/mysql2/connection_test.rb  |  7 +-
 activerecord/test/cases/associations_test.rb       | 23 +++++-
 .../test/cases/attribute_methods/read_test.rb      |  1 +
 .../connection_adapters/connection_handler_test.rb | 89 +++++++++++++++++++++
 activerecord/test/cases/enum_test.rb               |  3 +-
 activerecord/test/cases/fixtures_test.rb           | 15 ++--
 activerecord/test/cases/quoting_test.rb            |  4 +
 activerecord/test/cases/relation/merging_test.rb   | 13 ++++
 .../test/cases/scoping/named_scoping_test.rb       |  7 +-
 activerecord/test/cases/tasks/mysql_rake_test.rb   |  2 +-
 activerecord/test/models/comment.rb                |  1 +
 activerecord/test/models/developer.rb              |  2 +
 activerecord/test/schema/schema.rb                 |  1 +
 activesupport/CHANGELOG.md                         |  6 ++
 .../active_support/core_ext/object/duplicable.rb   | 10 +++
 activesupport/lib/active_support/gem_version.rb    |  2 +-
 activesupport/test/core_ext/duplicable_test.rb     |  2 +-
 guides/source/4_1_release_notes.md                 |  8 +-
 guides/source/upgrading_ruby_on_rails.md           |  2 +-
 rails.gemspec                                      |  2 +-
 railties/CHANGELOG.md                              | 12 +++
 railties/lib/rails/gem_version.rb                  |  2 +-
 .../rails/plugin/templates/test/test_helper.rb     |  8 +-
 railties/test/application/middleware/cache_test.rb | 12 +--
 railties/test/application/rake/dbs_test.rb         | 29 +++++++
 railties/test/application/test_test.rb             | 91 +++++++++++++++++++++-
 railties/test/generators/plugin_generator_test.rb  | 18 ++++-
 version.rb                                         |  2 +-
 80 files changed, 685 insertions(+), 123 deletions(-)

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