[DRE-commits] [rails] 01/02: Merge tag 'upstream/4.2.4'
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Tue Sep 1 06:27:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository rails.
commit 8cb45815ba7afdd578cd7df0931cc89e31abf3c1
Merge: df7ac27 b8d7a56
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Tue Sep 1 11:22:42 2015 +0530
Merge tag 'upstream/4.2.4'
Upstream version 4.2.4
# gpg: Signature made Tuesday 01 September 2015 11:22:37 AM IST using RSA key ID 4512C22A
# gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
# gpg: aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
# gpg: aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"
# gpg: aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
# gpg: aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"
.travis.yml | 4 -
Gemfile.lock | 72 +++++------
RAILS_VERSION | 2 +-
actionmailer/CHANGELOG.md | 5 +
actionmailer/lib/action_mailer/gem_version.rb | 2 +-
actionpack/CHANGELOG.md | 20 +++
actionpack/lib/action_controller/base.rb | 2 +-
.../lib/action_controller/metal/mime_responds.rb | 2 +
.../lib/action_controller/metal/params_wrapper.rb | 6 +-
actionpack/lib/action_controller/test_case.rb | 5 +
actionpack/lib/action_dispatch/http/upload.rb | 8 +-
actionpack/lib/action_dispatch/journey/router.rb | 3 +-
actionpack/lib/action_dispatch/middleware/ssl.rb | 2 +-
.../action_dispatch/testing/assertions/routing.rb | 2 +-
.../lib/action_dispatch/testing/integration.rb | 2 +
actionpack/lib/action_pack/gem_version.rb | 2 +-
.../request/multipart_params_parsing_test.rb | 11 ++
actionpack/test/dispatch/routing_test.rb | 18 +++
.../test/dispatch/session/test_session_test.rb | 10 ++
actionpack/test/dispatch/ssl_test.rb | 11 ++
actionpack/test/fixtures/multipart/utf8_filename | 10 ++
actionview/CHANGELOG.md | 6 +-
actionview/lib/action_view/gem_version.rb | 2 +-
actionview/lib/action_view/helpers/url_helper.rb | 3 +-
actionview/lib/action_view/test_case.rb | 3 +-
actionview/test/template/url_helper_test.rb | 7 ++
activejob/CHANGELOG.md | 9 ++
activejob/lib/active_job/base.rb | 2 +
activejob/lib/active_job/core.rb | 7 +-
activejob/lib/active_job/gem_version.rb | 2 +-
activejob/lib/active_job/queue_adapters.rb | 29 +++--
activejob/lib/active_job/translation.rb | 11 ++
activejob/test/cases/job_serialization_test.rb | 15 +++
activejob/test/cases/translation_test.rb | 20 +++
activejob/test/integration/queuing_test.rb | 17 +++
activejob/test/jobs/translated_hello_job.rb | 10 ++
.../test/support/integration/dummy_app_template.rb | 6 +-
.../test/support/integration/test_case_helpers.rb | 4 +
activemodel/CHANGELOG.md | 5 +
activemodel/lib/active_model/gem_version.rb | 2 +-
activemodel/lib/active_model/validations.rb | 7 +-
.../lib/active_model/validations/callbacks.rb | 2 +-
activerecord/CHANGELOG.md | 68 +++++++++++
.../lib/active_record/associations/association.rb | 18 ++-
.../associations/association_scope.rb | 1 +
.../builder/has_and_belongs_to_many.rb | 10 +-
.../associations/collection_association.rb | 8 +-
.../associations/has_many_association.rb | 9 +-
.../associations/has_many_through_association.rb | 6 +-
.../lib/active_record/associations/preloader.rb | 8 +-
.../associations/singular_association.rb | 10 +-
.../associations/through_association.rb | 6 -
.../lib/active_record/autosave_association.rb | 2 +-
activerecord/lib/active_record/callbacks.rb | 10 +-
.../abstract/connection_pool.rb | 4 +-
.../abstract/schema_statements.rb | 5 +-
.../connection_adapters/mysql2_adapter.rb | 2 +-
.../connection_adapters/postgresql/oid/array.rb | 2 +-
activerecord/lib/active_record/core.rb | 8 +-
activerecord/lib/active_record/gem_version.rb | 2 +-
activerecord/lib/active_record/migration.rb | 3 +-
activerecord/lib/active_record/model_schema.rb | 2 +-
activerecord/lib/active_record/railtie.rb | 2 +-
.../lib/active_record/railties/databases.rake | 15 ++-
activerecord/lib/active_record/relation.rb | 3 +-
activerecord/lib/active_record/relation/merger.rb | 25 +++-
.../lib/active_record/relation/query_methods.rb | 2 +-
activerecord/lib/active_record/scoping/default.rb | 1 +
activerecord/lib/active_record/transactions.rb | 8 +-
.../associations/belongs_to_associations_test.rb | 47 ++++++++
.../has_and_belongs_to_many_associations_test.rb | 12 ++
.../associations/has_many_associations_test.rb | 21 ++++
.../has_many_through_associations_test.rb | 35 ++++++
.../has_one_through_associations_test.rb | 34 ++++++
.../test/cases/autosave_association_test.rb | 7 ++
.../test/cases/migration/foreign_key_test.rb | 31 +++++
activerecord/test/cases/relation_test.rb | 6 +
activerecord/test/cases/relations_test.rb | 47 +++++++-
activerecord/test/cases/schema_dumper_test.rb | 5 +
.../test/cases/scoping/default_scoping_test.rb | 6 +
activerecord/test/cases/transactions_test.rb | 7 ++
activerecord/test/models/carrier.rb | 2 +
activerecord/test/models/categorization.rb | 2 +-
activerecord/test/models/comment.rb | 5 +
activerecord/test/models/customer_carrier.rb | 14 +++
activerecord/test/models/member.rb | 3 +
activerecord/test/models/membership.rb | 15 +++
activerecord/test/models/post.rb | 29 ++++-
activerecord/test/models/professor.rb | 5 +
activerecord/test/models/ship.rb | 7 ++
activerecord/test/models/shop_account.rb | 6 +
activerecord/test/models/treasure.rb | 1 +
activerecord/test/models/vehicle.rb | 7 ++
.../test/schema/postgresql_specific_schema.rb | 4 +
activerecord/test/schema/schema.rb | 23 ++++
activerecord/test/support/connection.rb | 1 +
activesupport/CHANGELOG.md | 19 +++
activesupport/lib/active_support/callbacks.rb | 14 ++-
.../lib/active_support/core_ext/object/json.rb | 2 +-
.../active_support/core_ext/time/calculations.rb | 6 +
activesupport/lib/active_support/gem_version.rb | 2 +-
.../active_support/hash_with_indifferent_access.rb | 14 ++-
.../lib/active_support/notifications/fanout.rb | 2 +-
activesupport/test/core_ext/hash_ext_test.rb | 35 ++++++
.../test/core_ext/object/json_gem_encoding_test.rb | 66 ++++++++++
.../test/hash_with_indifferent_access_test.rb | 10 --
activesupport/test/json/encoding_test.rb | 134 +++++----------------
activesupport/test/json/encoding_test_cases.rb | 88 ++++++++++++++
guides/CHANGELOG.md | 5 +
guides/source/action_view_overview.md | 8 --
guides/source/active_job_basics.md | 13 ++
guides/source/active_record_basics.md | 2 +-
guides/source/active_record_validations.md | 5 +-
guides/source/active_support_instrumentation.md | 11 --
guides/source/contributing_to_ruby_on_rails.md | 2 +-
guides/source/getting_started.md | 13 +-
guides/source/routing.md | 4 +-
guides/source/working_with_javascript_in_rails.md | 2 +-
railties/CHANGELOG.md | 14 +++
railties/lib/rails/gem_version.rb | 2 +-
railties/lib/rails/generators/actions.rb | 5 +-
railties/lib/rails/generators/named_base.rb | 4 +
.../rails/generators/rails/app/templates/Gemfile | 6 +-
.../templates/test/integration/navigation_test.rb | 4 -
.../rails/plugin/templates/test/test_helper.rb | 1 +
.../controller/templates/functional_test.rb | 2 +-
.../test_unit/scaffold/scaffold_generator.rb | 2 +-
.../scaffold/templates/functional_test.rb | 2 +-
railties/lib/rails/tasks.rb | 5 +-
railties/test/application/rake/migrations_test.rb | 14 ++-
railties/test/generators/plugin_generator_test.rb | 1 +
.../scaffold_controller_generator_test.rb | 11 ++
.../test/generators/scaffold_generator_test.rb | 14 +++
tasks/release.rb | 2 +-
version.rb | 2 +-
135 files changed, 1215 insertions(+), 323 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