[DRE-commits] [rails] 01/07: Merge tag 'upstream/4.1.10'
Antonio Terceiro
terceiro at moszumanska.debian.org
Sun May 24 22:12:20 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 019f9621cfcda7de84bafaefb401c0228e83f429
Merge: 0c5cee8 ba69255
Author: Antonio Terceiro <terceiro at debian.org>
Date: Fri Apr 3 18:19:12 2015 -0300
Merge tag 'upstream/4.1.10'
Upstream version 4.1.10
# gpg: Signature made Sex 03 Abr 2015 18:19:09 BRT 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>"
.gitignore | 1 -
.travis.yml | 10 +-
Gemfile | 3 +-
Gemfile.lock | 154 ++++++++++++++++
RAILS_VERSION | 2 +-
actionmailer/CHANGELOG.md | 22 +++
actionmailer/lib/action_mailer/gem_version.rb | 2 +-
actionpack/CHANGELOG.md | 61 +++++++
actionpack/lib/action_controller/base.rb | 2 +-
.../action_controller/metal/http_authentication.rb | 11 +-
.../lib/action_controller/metal/instrumentation.rb | 11 +-
.../lib/action_dispatch/http/mime_negotiation.rb | 2 +-
.../lib/action_dispatch/http/parameter_filter.rb | 2 +-
.../lib/action_dispatch/middleware/cookies.rb | 12 +-
actionpack/lib/action_dispatch/middleware/flash.rb | 2 +-
.../lib/action_dispatch/routing/route_set.rb | 18 +-
.../lib/action_dispatch/testing/test_response.rb | 7 +
actionpack/lib/action_pack/gem_version.rb | 2 +-
actionpack/test/controller/base_test.rb | 40 +++++
actionpack/test/controller/flash_hash_test.rb | 9 +
.../controller/http_token_authentication_test.rb | 45 ++++-
actionpack/test/controller/integration_test.rb | 23 +++
actionpack/test/controller/log_subscriber_test.rb | 20 +++
actionpack/test/dispatch/request_test.rb | 11 +-
actionpack/test/dispatch/routing_test.rb | 28 +++
actionview/CHANGELOG.md | 34 ++++
actionview/lib/action_view/gem_version.rb | 2 +-
actionview/lib/action_view/helpers/form_helper.rb | 8 +-
.../lib/action_view/helpers/form_tag_helper.rb | 4 +-
.../lib/action_view/helpers/translation_helper.rb | 45 +++--
.../lib/action_view/renderer/partial_renderer.rb | 16 +-
actionview/test/template/form_tag_helper_test.rb | 6 +
actionview/test/template/render_test.rb | 20 ++-
.../test/template/translation_helper_test.rb | 35 ++++
activemodel/CHANGELOG.md | 25 +++
activemodel/lib/active_model/gem_version.rb | 2 +-
activerecord/CHANGELOG.md | 112 ++++++++++++
.../associations/association_scope.rb | 6 +-
.../associations/collection_association.rb | 27 ++-
.../active_record/associations/collection_proxy.rb | 4 +
.../lib/active_record/associations/preloader.rb | 1 +
.../associations/preloader/association.rb | 1 +
.../associations/through_association.rb | 11 ++
.../attribute_methods/time_zone_conversion.rb | 14 +-
.../abstract/connection_pool.rb | 2 +-
.../abstract/schema_definitions.rb | 4 +-
.../abstract/schema_statements.rb | 6 +-
.../connection_adapters/abstract_adapter.rb | 7 +-
.../connection_adapters/abstract_mysql_adapter.rb | 4 +-
.../connection_adapters/postgresql/oid.rb | 3 +
.../postgresql/schema_statements.rb | 3 +
activerecord/lib/active_record/core.rb | 1 -
activerecord/lib/active_record/fixtures.rb | 2 +-
activerecord/lib/active_record/gem_version.rb | 2 +-
activerecord/lib/active_record/migration.rb | 9 +-
activerecord/lib/active_record/persistence.rb | 3 +-
activerecord/lib/active_record/railtie.rb | 2 -
.../lib/active_record/railties/databases.rake | 12 +-
activerecord/lib/active_record/reflection.rb | 9 +-
activerecord/lib/active_record/relation/batches.rb | 1 +
.../active_record/relation/predicate_builder.rb | 28 ++-
.../relation/predicate_builder/relation_handler.rb | 4 +
.../lib/active_record/relation/query_methods.rb | 28 +--
.../lib/active_record/tasks/database_tasks.rb | 2 -
activerecord/lib/active_record/transactions.rb | 2 +-
.../lib/active_record/validations/uniqueness.rb | 10 +-
activerecord/test/cases/adapter_test.rb | 12 ++
.../test/cases/adapters/postgresql/array_test.rb | 21 +++
.../cases/adapters/postgresql/datatype_test.rb | 10 +-
.../cases/adapters/postgresql/infinity_test.rb | 34 ++++
.../cases/adapters/postgresql/rename_table_test.rb | 34 ++++
.../test/cases/adapters/postgresql/schema_test.rb | 2 +-
activerecord/test/cases/associations/eager_test.rb | 8 +
.../associations/has_many_associations_test.rb | 58 +++++-
.../has_many_through_associations_test.rb | 68 +++++++-
.../associations/inverse_associations_test.rb | 12 ++
activerecord/test/cases/batches_test.rb | 15 ++
activerecord/test/cases/dirty_test.rb | 9 +
activerecord/test/cases/finder_test.rb | 4 +-
activerecord/test/cases/fixtures_test.rb | 14 ++
activerecord/test/cases/inheritance_test.rb | 6 +
.../test/cases/migration/change_table_test.rb | 4 +-
activerecord/test/cases/reaper_test.rb | 2 +-
activerecord/test/cases/relation/merging_test.rb | 2 +-
activerecord/test/cases/relation/mutation_test.rb | 12 +-
activerecord/test/cases/relation/where_test.rb | 56 +++++-
activerecord/test/cases/relations_test.rb | 10 ++
.../test/cases/transaction_callbacks_test.rb | 4 +
.../validations/uniqueness_validation_test.rb | 42 +++++
activerecord/test/fixtures/bulbs.yml | 5 +
activerecord/test/models/organization.rb | 2 +
.../test/schema/postgresql_specific_schema.rb | 3 +-
activesupport/CHANGELOG.md | 50 ++++++
activesupport/lib/active_support/cache.rb | 2 +-
activesupport/lib/active_support/callbacks.rb | 194 +++++++++++++--------
.../lib/active_support/core_ext/string/filters.rb | 2 +-
.../core_ext/string/output_safety.rb | 8 +-
.../lib/active_support/core_ext/time/zones.rb | 1 +
activesupport/lib/active_support/duration.rb | 2 +-
activesupport/lib/active_support/gem_version.rb | 2 +-
activesupport/lib/active_support/i18n_railtie.rb | 6 +-
.../lib/active_support/multibyte/unicode.rb | 1 -
.../lib/active_support/values/time_zone.rb | 5 +-
activesupport/test/caching_test.rb | 2 +-
activesupport/test/core_ext/duration_test.rb | 9 +
activesupport/test/core_ext/string_ext_test.rb | 8 +-
activesupport/test/safe_buffer_test.rb | 12 ++
guides/CHANGELOG.md | 25 +++
.../bug_report_templates/action_controller_gem.rb | 4 +-
.../action_controller_master.rb | 4 +-
guides/source/3_1_release_notes.md | 2 +-
guides/source/active_support_core_extensions.md | 2 +-
guides/source/asset_pipeline.md | 4 +-
guides/source/engines.md | 37 +++-
guides/source/getting_started.md | 2 +-
guides/source/security.md | 2 +-
guides/source/testing.md | 2 +-
guides/source/upgrading_ruby_on_rails.md | 2 +-
railties/CHANGELOG.md | 47 +++++
railties/lib/rails/application.rb | 31 +++-
railties/lib/rails/engine.rb | 8 +-
railties/lib/rails/gem_version.rb | 2 +-
railties/lib/rails/generators/actions.rb | 4 +-
railties/lib/rails/generators/app_base.rb | 27 +--
.../rails/generators/rails/app/app_generator.rb | 2 +-
.../app/assets/javascripts/application.js.tt | 2 +-
.../rails/app/templates/config/application.rb | 1 +
.../rails/plugin/templates/rails/javascripts.js | 2 +-
.../rails/plugin/templates/test/test_helper.rb | 4 +-
.../resource_route/resource_route_generator.rb | 6 +-
.../scaffold_controller_generator.rb | 1 +
railties/test/application/configuration_test.rb | 192 +++++++++++++++++---
.../test/application/initializers/i18n_test.rb | 24 ++-
.../test/application/middleware/session_test.rb | 8 +-
.../test/application/multiple_applications_test.rb | 14 +-
railties/test/application/rake/dbs_test.rb | 34 +++-
railties/test/application/test_test.rb | 94 +++++++++-
railties/test/application/url_generation_test.rb | 2 +-
railties/test/generators/actions_test.rb | 26 ++-
railties/test/generators/plugin_generator_test.rb | 1 +
.../test/generators/scaffold_generator_test.rb | 37 ++++
tasks/release.rb | 2 +-
version.rb | 2 +-
143 files changed, 2086 insertions(+), 343 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