[DRE-commits] [rails] 01/03: Merge tag 'upstream/4.2.5'
Antonio Terceiro
terceiro at moszumanska.debian.org
Mon Dec 14 13:35:24 UTC 2015
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository rails.
commit adabd23afc351abc47f04df9b78bd837fa5b6857
Merge: 78c6350 4aa4a9b
Author: Antonio Terceiro <terceiro at debian.org>
Date: Mon Dec 14 11:03:53 2015 -0200
Merge tag 'upstream/4.2.5'
Upstream version 4.2.5
# gpg: Signature made Seg 14 Dez 2015 11:03:53 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>"
Gemfile | 3 +-
Gemfile.lock | 189 +++++++++++----------
RAILS_VERSION | 2 +-
actionmailer/CHANGELOG.md | 5 +
actionmailer/lib/action_mailer.rb | 7 +
actionmailer/lib/action_mailer/gem_version.rb | 2 +-
actionpack/CHANGELOG.md | 29 ++++
actionpack/lib/action_controller/test_case.rb | 6 +-
actionpack/lib/action_dispatch/http/url.rb | 2 +-
actionpack/lib/action_dispatch/routing/mapper.rb | 1 +
.../lib/action_dispatch/routing/route_set.rb | 16 +-
actionpack/lib/action_dispatch/routing/url_for.rb | 3 +-
.../lib/action_dispatch/testing/assertions.rb | 2 +-
actionpack/lib/action_pack/gem_version.rb | 2 +-
actionpack/test/controller/integration_test.rb | 30 ++--
actionpack/test/controller/test_case_test.rb | 19 +++
actionpack/test/controller/url_for_test.rb | 20 +++
.../test/dispatch/routing/ipv6_redirect_test.rb | 45 +++++
.../test/dispatch/session/test_session_test.rb | 10 ++
actionpack/test/journey/route_test.rb | 2 +-
actionview/CHANGELOG.md | 11 ++
actionview/lib/action_view/gem_version.rb | 2 +-
actionview/lib/action_view/helpers/url_helper.rb | 2 +-
actionview/lib/action_view/routing_url_for.rb | 5 +-
actionview/test/template/url_helper_test.rb | 35 ++++
activejob/CHANGELOG.md | 6 +
activejob/lib/active_job/gem_version.rb | 2 +-
activejob/lib/active_job/logging.rb | 2 +-
.../support/integration/adapters/queue_classic.rb | 1 +
activemodel/CHANGELOG.md | 5 +
activemodel/lib/active_model/gem_version.rb | 2 +-
activemodel/lib/active_model/naming.rb | 2 +-
activerecord/CHANGELOG.md | 103 +++++++++++
activerecord/lib/active_record.rb | 1 +
.../associations/association_scope.rb | 2 +-
.../active_record/associations/join_dependency.rb | 3 +-
.../associations/preloader/association.rb | 6 +-
activerecord/lib/active_record/attribute_set.rb | 4 +
.../lib/active_record/attribute_set/builder.rb | 32 ++--
.../abstract/database_statements.rb | 8 +-
.../connection_adapters/abstract_adapter.rb | 1 -
.../active_record/connection_adapters/column.rb | 2 +-
.../connection_adapters/mysql2_adapter.rb | 2 +-
.../postgresql/oid/type_map_initializer.rb | 2 +-
.../postgresql/schema_statements.rb | 2 +-
.../connection_adapters/postgresql_adapter.rb | 8 +-
activerecord/lib/active_record/core.rb | 2 +
activerecord/lib/active_record/enum.rb | 3 +-
activerecord/lib/active_record/errors.rb | 7 +-
activerecord/lib/active_record/gem_version.rb | 2 +-
.../lib/active_record/legacy_yaml_adapter.rb | 30 ++++
activerecord/lib/active_record/migration.rb | 5 +-
activerecord/lib/active_record/reflection.rb | 56 +++---
.../lib/active_record/relation/query_methods.rb | 2 +-
.../lib/active_record/tasks/database_tasks.rb | 2 +-
.../active_record/tasks/mysql_database_tasks.rb | 28 ++-
.../tasks/postgresql_database_tasks.rb | 27 ++-
activerecord/lib/active_record/type/decimal.rb | 4 +-
.../lib/active_record/validations/uniqueness.rb | 8 +-
activerecord/test/cases/associations/eager_test.rb | 18 ++
.../has_and_belongs_to_many_associations_test.rb | 40 +++++
.../associations/has_many_associations_test.rb | 20 +++
.../associations/inverse_associations_test.rb | 13 ++
activerecord/test/cases/attribute_set_test.rb | 10 ++
activerecord/test/cases/base_test.rb | 28 +++
activerecord/test/cases/fixtures_test.rb | 7 +
activerecord/test/cases/multiple_db_test.rb | 14 +-
activerecord/test/cases/relation_test.rb | 29 +++-
.../test/cases/tasks/database_tasks_test.rb | 4 +-
activerecord/test/cases/tasks/mysql_rake_test.rb | 19 ++-
.../test/cases/tasks/postgresql_rake_test.rb | 8 +-
activerecord/test/cases/type/decimal_test.rb | 5 +
.../validations/uniqueness_validation_test.rb | 23 +++
activerecord/test/cases/yaml_serialization_test.rb | 40 +++++
activerecord/test/fixtures/naked/yml/parrots.yml | 2 +
activerecord/test/models/company.rb | 3 +
activerecord/test/models/developer.rb | 3 +
activerecord/test/models/project.rb | 2 +
activerecord/test/schema/schema.rb | 6 +
activesupport/CHANGELOG.md | 15 ++
activesupport/lib/active_support/cache.rb | 2 +-
.../core_ext/module/method_transplanting.rb | 4 +-
.../active_support/core_ext/numeric/conversions.rb | 4 +-
.../lib/active_support/core_ext/object/blank.rb | 4 +-
.../lib/active_support/core_ext/object/try.rb | 4 +-
.../active_support/core_ext/time/calculations.rb | 1 +
activesupport/lib/active_support/gem_version.rb | 2 +-
.../active_support/hash_with_indifferent_access.rb | 2 +-
.../lib/active_support/message_verifier.rb | 2 +-
.../lib/active_support/per_thread_registry.rb | 6 +-
activesupport/lib/active_support/time_with_zone.rb | 2 +-
activesupport/test/core_ext/hash_ext_test.rb | 7 +
activesupport/test/core_ext/time_with_zone_test.rb | 4 +
activesupport/test/message_verifier_test.rb | 1 +
guides/CHANGELOG.md | 5 +
guides/source/_welcome.html.erb | 6 +-
guides/source/active_job_basics.md | 20 ++-
guides/source/active_record_querying.md | 2 -
guides/source/configuring.md | 29 +++-
guides/source/security.md | 2 +-
railties/CHANGELOG.md | 8 +
railties/lib/rails/engine/configuration.rb | 2 +-
railties/lib/rails/gem_version.rb | 2 +-
railties/lib/rails/generators/app_base.rb | 33 ++--
.../rails/plugin/templates/%name%.gemspec | 2 +-
.../generators/rails/plugin/templates/Gemfile | 2 +-
.../scaffold_controller/templates/controller.rb | 2 +-
railties/lib/rails/mailers_controller.rb | 6 +-
railties/test/application/mailer_previews_test.rb | 2 +-
railties/test/generators/app_generator_test.rb | 12 +-
.../test/generators/namespaced_generators_test.rb | 1 +
railties/test/railties/engine_test.rb | 49 ++++++
tasks/release.rb | 23 ++-
version.rb | 2 +-
114 files changed, 1104 insertions(+), 282 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/rails.git
More information about the Pkg-ruby-extras-commits
mailing list