[DRE-commits] [rails] 02/04: Merge tag 'upstream/4.1.6'
Antonio Terceiro
terceiro at moszumanska.debian.org
Fri Sep 26 19:08:22 UTC 2014
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository rails.
commit 4ac373be3e0a719135b6fdba3e466e3086cffc17
Merge: c437c8d d63c9ab
Author: Antonio Terceiro <terceiro at debian.org>
Date: Fri Sep 26 15:59:04 2014 -0300
Merge tag 'upstream/4.1.6'
Upstream version 4.1.6
# gpg: Signature made Sex 26 Set 2014 15:59:01 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>"
RAILS_VERSION | 2 +-
actionmailer/CHANGELOG.md | 23 +++
actionmailer/actionmailer.gemspec | 2 +-
actionmailer/lib/action_mailer/base.rb | 19 ++-
actionmailer/lib/action_mailer/gem_version.rb | 2 +-
actionmailer/lib/action_mailer/preview.rb | 2 +
actionmailer/lib/action_mailer/railtie.rb | 1 +
actionmailer/test/base_test.rb | 39 +++++
actionpack/CHANGELOG.md | 49 ++++++
actionpack/lib/abstract_controller/base.rb | 2 +-
.../action_controller/metal/http_authentication.rb | 8 +-
.../lib/action_controller/metal/redirecting.rb | 1 +
.../lib/action_controller/metal/renderers.rb | 7 +-
.../action_controller/metal/strong_parameters.rb | 7 +-
actionpack/lib/action_dispatch/journey/router.rb | 4 +-
.../lib/action_dispatch/journey/router/utils.rb | 12 +-
.../middleware/session/cache_store.rb | 6 +-
.../middleware/session/cookie_store.rb | 2 +-
actionpack/lib/action_dispatch/routing.rb | 2 +-
actionpack/lib/action_dispatch/routing/mapper.rb | 8 +-
actionpack/lib/action_pack/gem_version.rb | 2 +-
.../controller/http_token_authentication_test.rb | 29 +++-
actionpack/test/controller/mime/respond_to_test.rb | 13 ++
actionpack/test/controller/redirect_test.rb | 10 ++
actionpack/test/controller/render_json_test.rb | 2 +-
actionpack/test/controller/required_params_test.rb | 18 ++-
actionpack/test/dispatch/mount_test.rb | 7 +
actionpack/test/dispatch/routing_test.rb | 22 +++
.../test/dispatch/session/cache_store_test.rb | 17 +--
.../test/dispatch/session/mem_cache_store_test.rb | 18 +++
actionpack/test/journey/router/utils_test.rb | 5 +
actionview/CHANGELOG.md | 20 +++
actionview/lib/action_view/dependency_tracker.rb | 14 +-
actionview/lib/action_view/gem_version.rb | 2 +-
.../lib/action_view/helpers/asset_url_helper.rb | 2 +-
.../lib/action_view/helpers/atom_feed_helper.rb | 2 +-
.../lib/action_view/helpers/form_options_helper.rb | 170 ++++++++++-----------
.../lib/action_view/helpers/sanitize_helper.rb | 4 +-
actionview/lib/action_view/helpers/tags/select.rb | 2 +-
actionview/lib/action_view/tasks/dependencies.rake | 16 +-
actionview/test/template/asset_tag_helper_test.rb | 8 +
.../test/template/dependency_tracker_test.rb | 15 ++
actionview/test/template/erb_util_test.rb | 1 +
.../test/template/form_options_helper_test.rb | 13 ++
actionview/test/template/number_helper_test.rb | 1 +
actionview/test/template/tag_helper_test.rb | 1 +
activemodel/CHANGELOG.md | 5 +
activemodel/lib/active_model/gem_version.rb | 2 +-
activemodel/lib/active_model/validator.rb | 2 +-
activerecord/CHANGELOG.md | 162 ++++++++++++++++++++
activerecord/lib/active_record.rb | 1 +
activerecord/lib/active_record/associations.rb | 6 +-
.../active_record/associations/alias_tracker.rb | 12 +-
.../builder/has_and_belongs_to_many.rb | 9 ++
.../associations/has_many_through_association.rb | 6 +-
.../associations/through_association.rb | 16 +-
.../lib/active_record/attribute_methods.rb | 13 +-
.../active_record/attribute_methods/primary_key.rb | 9 +-
.../attribute_methods/serialization.rb | 7 +-
.../lib/active_record/autosave_association.rb | 1 -
activerecord/lib/active_record/coders/json.rb | 13 ++
.../abstract/connection_pool.rb | 4 +-
.../connection_adapters/abstract/transaction.rb | 1 +
.../connection_adapters/abstract_mysql_adapter.rb | 4 +-
.../connection_specification.rb | 2 +-
.../connection_adapters/postgresql/oid.rb | 10 +-
.../connection_adapters/postgresql/quoting.rb | 2 +-
.../postgresql/schema_statements.rb | 3 +-
activerecord/lib/active_record/counter_cache.rb | 2 +-
activerecord/lib/active_record/enum.rb | 4 +-
activerecord/lib/active_record/gem_version.rb | 2 +-
activerecord/lib/active_record/migration.rb | 19 ++-
activerecord/lib/active_record/persistence.rb | 1 +
.../lib/active_record/railties/databases.rake | 9 +-
activerecord/lib/active_record/reflection.rb | 12 +-
activerecord/lib/active_record/relation.rb | 9 +-
.../lib/active_record/relation/calculations.rb | 7 +-
.../lib/active_record/relation/finder_methods.rb | 13 +-
.../lib/active_record/relation/query_methods.rb | 18 ++-
activerecord/lib/active_record/schema_dumper.rb | 3 +-
activerecord/lib/active_record/schema_migration.rb | 7 +
.../adapters/postgresql/custom_domain_test.rb | 28 ++++
.../test/cases/adapters/postgresql/hstore_test.rb | 10 ++
.../test/cases/adapters/postgresql/json_test.rb | 8 +
.../adapters/postgresql/postgresql_adapter_test.rb | 19 +++
.../test/cases/adapters/postgresql/uuid_test.rb | 23 +++
activerecord/test/cases/ar_schema_test.rb | 21 +++
.../associations/has_many_associations_test.rb | 17 ++-
.../has_many_through_associations_test.rb | 15 +-
.../has_one_through_associations_test.rb | 14 ++
.../associations/inner_join_association_test.rb | 10 ++
.../associations/inverse_associations_test.rb | 11 ++
activerecord/test/cases/attribute_methods_test.rb | 18 +++
activerecord/test/cases/calculations_test.rb | 7 +
.../connection_adapters/connection_handler_test.rb | 12 ++
activerecord/test/cases/counter_cache_test.rb | 10 ++
activerecord/test/cases/finder_test.rb | 11 ++
activerecord/test/cases/migration_test.rb | 15 ++
activerecord/test/cases/persistence_test.rb | 21 +++
activerecord/test/cases/primary_keys_test.rb | 10 ++
activerecord/test/cases/reflection_test.rb | 20 +++
activerecord/test/cases/relation/where_test.rb | 9 ++
activerecord/test/cases/schema_dumper_test.rb | 2 +-
.../test/cases/serialized_attribute_test.rb | 34 ++++-
.../test/cases/transaction_callbacks_test.rb | 13 ++
activerecord/test/models/face.rb | 2 +
activerecord/test/models/man.rb | 1 +
activerecord/test/schema/schema.rb | 2 +
activesupport/CHANGELOG.md | 31 ++++
.../core_ext/date_time/calculations.rb | 4 +-
.../lib/active_support/core_ext/object/json.rb | 6 +-
.../lib/active_support/core_ext/object/to_param.rb | 61 +-------
.../lib/active_support/core_ext/object/to_query.rb | 65 +++++++-
.../core_ext/string/output_safety.rb | 2 +-
activesupport/lib/active_support/dependencies.rb | 8 +-
activesupport/lib/active_support/gem_version.rb | 2 +-
.../number_helper/number_to_rounded_converter.rb | 8 +-
activesupport/test/core_ext/hash_ext_test.rb | 8 +
.../test/core_ext/object/json_cherry_pick_test.rb | 42 +++++
.../test/core_ext/object/to_param_test.rb | 12 ++
.../test/core_ext/object/to_query_test.rb | 10 ++
activesupport/test/core_ext/range_ext_test.rb | 1 +
activesupport/test/dependencies_test.rb | 5 +-
activesupport/test/number_helper_test.rb | 3 +
guides/CHANGELOG.md | 5 +
guides/code/getting_started/Rakefile | 2 +-
guides/code/getting_started/config.ru | 2 +-
guides/code/getting_started/config/environment.rb | 2 +-
.../config/environments/development.rb | 2 +-
.../config/environments/production.rb | 2 +-
.../getting_started/config/environments/test.rb | 2 +-
.../config/initializers/secret_token.rb | 2 +-
.../config/initializers/session_store.rb | 2 +-
guides/code/getting_started/config/routes.rb | 2 +-
guides/source/4_1_release_notes.md | 2 +-
guides/source/_welcome.html.erb | 4 +-
guides/source/action_controller_overview.md | 6 +-
guides/source/active_record_querying.md | 24 ++-
guides/source/active_record_validations.md | 2 +-
guides/source/asset_pipeline.md | 12 +-
guides/source/command_line.md | 16 +-
guides/source/debugging_rails_applications.md | 22 +--
guides/source/getting_started.md | 5 +-
guides/source/i18n.md | 6 +-
guides/source/initialization.md | 2 +-
guides/source/maintenance_policy.md | 27 +++-
guides/source/migrations.md | 52 +++++--
guides/source/rails_on_rack.md | 9 +-
guides/source/routing.md | 4 +-
guides/source/security.md | 2 +-
guides/source/upgrading_ruby_on_rails.md | 31 +++-
railties/CHANGELOG.md | 17 +++
railties/lib/rails/application.rb | 14 +-
railties/lib/rails/gem_version.rb | 2 +-
railties/lib/rails/generators/app_base.rb | 4 +-
.../erb/scaffold/templates/_form.html.erb | 2 +-
.../templates/config/environments/production.rb.tt | 8 +-
.../rails/controller/controller_generator.rb | 4 +-
.../lib/rails/generators/testing/assertions.rb | 2 +
railties/test/application/configuration_test.rb | 32 ++++
railties/test/generators/plugin_generator_test.rb | 12 ++
railties/test/railties/engine_test.rb | 68 +++++++++
version.rb | 2 +-
163 files changed, 1667 insertions(+), 388 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