[DRE-commits] [rails-4.0] 03/04: Merge tag 'upstream/4.0.2+dfsg'
Ondrej Sury
ondrej at moszumanska.debian.org
Wed Dec 4 09:46:10 UTC 2013
This is an automated email from the git hooks/post-receive script.
ondrej pushed a commit to branch master
in repository rails-4.0.
commit 87c5d5957e9adcd461588dd71005aa53051c3cd1
Merge: a053eb2 81dc9da
Author: Ondřej Surý <ondrej at sury.org>
Date: Wed Dec 4 10:33:23 2013 +0100
Merge tag 'upstream/4.0.2+dfsg'
Upstream version 4.0.2+dfsg
# gpg: Signature made Wed 04 Dec 2013 10:33:23 AM CET using RSA key ID F4FCBB07
# gpg: Good signature from "Ondřej Surý <ondrej at sury.org>"
# gpg: aka "Ondřej Surý <ondrej at debian.org>"
# gpg: aka "[jpeg image of size 3934]"
.gitignore | 2 +-
.travis.yml | 6 +
Gemfile | 9 +-
RAILS_VERSION | 2 +-
Rakefile | 18 +-
actionmailer/CHANGELOG.md | 11 +
actionmailer/README.rdoc | 2 +-
actionmailer/actionmailer.gemspec | 2 +-
actionmailer/lib/action_mailer/base.rb | 2 +-
actionmailer/lib/action_mailer/delivery_methods.rb | 2 +-
actionmailer/lib/action_mailer/version.rb | 2 +-
actionmailer/test/base_test.rb | 4 +
actionmailer/test/delivery_methods_test.rb | 3 +
actionmailer/test/fixtures/raw_email10 | 20 --
actionmailer/test/fixtures/raw_email12 | 32 --
actionmailer/test/fixtures/raw_email13 | 29 --
actionmailer/test/fixtures/raw_email2 | 114 -------
actionmailer/test/fixtures/raw_email3 | 70 -----
actionmailer/test/fixtures/raw_email4 | 59 ----
actionmailer/test/fixtures/raw_email5 | 19 --
actionmailer/test/fixtures/raw_email6 | 20 --
actionmailer/test/fixtures/raw_email7 | 66 -----
actionmailer/test/fixtures/raw_email8 | 47 ---
actionmailer/test/fixtures/raw_email9 | 28 --
.../test/fixtures/raw_email_quoted_with_0d0a | 14 -
...w_email_with_invalid_characters_in_content_type | 104 -------
.../test/fixtures/raw_email_with_nested_attachment | 100 -------
.../raw_email_with_partially_quoted_subject | 14 -
actionmailer/test/mailers/proc_mailer.rb | 3 +-
actionpack/CHANGELOG.md | 232 +++++++++++++++
actionpack/README.rdoc | 2 +-
actionpack/Rakefile | 14 +-
actionpack/lib/abstract_controller/callbacks.rb | 2 +-
actionpack/lib/abstract_controller/helpers.rb | 7 +-
actionpack/lib/action_controller/base.rb | 2 +-
actionpack/lib/action_controller/metal/flash.rb | 2 +-
.../action_controller/metal/strong_parameters.rb | 9 +-
actionpack/lib/action_controller/test_case.rb | 2 +-
actionpack/lib/action_dispatch/http/mime_type.rb | 2 +-
actionpack/lib/action_dispatch/http/request.rb | 4 +-
actionpack/lib/action_dispatch/http/response.rb | 4 +-
.../lib/action_dispatch/journey/formatter.rb | 6 +-
.../journey/gtg/transition_table.rb | 35 ++-
actionpack/lib/action_dispatch/journey/route.rb | 12 +
.../lib/action_dispatch/journey/router/utils.rb | 3 +
actionpack/lib/action_dispatch/journey/routes.rb | 1 +
actionpack/lib/action_dispatch/journey/visitors.rb | 7 +-
.../lib/action_dispatch/middleware/cookies.rb | 2 +-
.../action_dispatch/middleware/params_parser.rb | 2 +-
.../lib/action_dispatch/middleware/remote_ip.rb | 2 +-
actionpack/lib/action_dispatch/middleware/ssl.rb | 5 +-
actionpack/lib/action_dispatch/routing/mapper.rb | 5 +
.../lib/action_dispatch/routing/redirection.rb | 18 ++
.../lib/action_dispatch/routing/route_set.rb | 27 +-
.../lib/action_dispatch/testing/assertions/dom.rb | 8 +-
.../lib/action_dispatch/testing/test_request.rb | 10 +-
actionpack/lib/action_pack/version.rb | 2 +-
actionpack/lib/action_view/dependency_tracker.rb | 2 +-
actionpack/lib/action_view/digestor.rb | 40 ++-
actionpack/lib/action_view/helpers/date_helper.rb | 4 +-
actionpack/lib/action_view/helpers/form_helper.rb | 2 +-
.../lib/action_view/helpers/form_options_helper.rb | 17 +-
.../lib/action_view/helpers/number_helper.rb | 1 +
actionpack/lib/action_view/helpers/tags/base.rb | 3 +-
.../helpers/tags/collection_check_boxes.rb | 3 +-
.../action_view/helpers/tags/collection_helpers.rb | 3 +-
.../lib/action_view/helpers/tags/color_field.rb | 2 +-
.../lib/action_view/helpers/tags/datetime_field.rb | 2 +-
actionpack/lib/action_view/helpers/tags/label.rb | 1 +
.../lib/action_view/helpers/tags/text_area.rb | 2 +-
.../lib/action_view/helpers/tags/text_field.rb | 4 +-
actionpack/lib/action_view/helpers/text_helper.rb | 7 +-
.../lib/action_view/helpers/translation_helper.rb | 22 +-
actionpack/lib/action_view/helpers/url_helper.rb | 7 +-
actionpack/lib/action_view/lookup_context.rb | 7 +
actionpack/lib/action_view/railtie.rb | 4 +
.../lib/action_view/renderer/template_renderer.rb | 2 +-
actionpack/lib/action_view/tasks/dependencies.rake | 17 ++
actionpack/test/abstract/.helper_test.rb.swp | Bin 0 -> 12288 bytes
actionpack/test/abstract/helper_test.rb | 20 ++
actionpack/test/controller/filters_test.rb | 9 +
actionpack/test/controller/flash_test.rb | 12 +
actionpack/test/controller/integration_test.rb | 6 +-
.../parameters/nested_parameters_test.rb | 15 +
.../parameters/parameters_permit_test.rb | 9 +
actionpack/test/controller/render_test.rb | 27 +-
actionpack/test/controller/routing_test.rb | 4 +
actionpack/test/dispatch/prefix_generation_test.rb | 100 +++++++
.../dispatch/request/json_params_parsing_test.rb | 7 +
.../dispatch/request/query_string_parsing_test.rb | 15 +
actionpack/test/dispatch/routing_test.rb | 66 +++++
actionpack/test/dispatch/ssl_test.rb | 19 ++
actionpack/test/dispatch/test_request_test.rb | 30 ++
.../fixtures/digestor/level/_recursion.html.erb | 1 +
.../fixtures/digestor/level/recursion.html.erb | 1 +
.../helpers_missing/invalid_require_helper.rb | 5 +
actionpack/test/journey/router/utils_test.rb | 8 +
actionpack/test/journey/router_test.rb | 22 +-
actionpack/test/routing/helper_test.rb | 2 +-
actionpack/test/template/date_helper_test.rb | 12 +-
.../test/template/dependency_tracker_test.rb | 54 +++-
actionpack/test/template/digestor_test.rb | 63 +++-
.../test/template/form_collections_helper_test.rb | 11 +-
actionpack/test/template/form_helper_test.rb | 60 ++++
.../test/template/form_options_helper_test.rb | 16 +
actionpack/test/template/number_helper_test.rb | 3 +-
actionpack/test/template/render_test.rb | 5 +
actionpack/test/template/resolver_patterns_test.rb | 2 +-
actionpack/test/template/text_helper_test.rb | 3 +
.../test/template/translation_helper_test.rb | 2 +-
actionpack/test/template/url_helper_test.rb | 33 +++
actionpack/test/ts_isolated.rb | 15 -
activemodel/CHANGELOG.md | 17 ++
activemodel/README.rdoc | 2 +-
activemodel/lib/active_model/attribute_methods.rb | 5 +-
activemodel/lib/active_model/errors.rb | 10 +-
activemodel/lib/active_model/secure_password.rb | 8 +-
.../lib/active_model/validations/clusivity.rb | 15 +-
.../lib/active_model/validations/inclusion.rb | 2 +-
activemodel/lib/active_model/version.rb | 2 +-
activemodel/test/cases/railtie_test.rb | 5 +-
activemodel/test/cases/secure_password_test.rb | 8 +
.../cases/serializers/json_serialization_test.rb | 2 +-
.../cases/serializers/xml_serialization_test.rb | 3 +-
.../cases/validations/inclusion_validation_test.rb | 23 ++
activemodel/test/models/topic.rb | 2 +-
activerecord/CHANGELOG.md | 329 ++++++++++++++++++++-
activerecord/README.rdoc | 2 +-
activerecord/Rakefile | 2 -
activerecord/lib/active_record.rb | 1 +
.../lib/active_record/association_relation.rb | 18 ++
.../lib/active_record/associations/association.rb | 14 +-
.../associations/builder/belongs_to.rb | 6 +-
.../associations/collection_association.rb | 16 +-
.../active_record/associations/collection_proxy.rb | 6 +-
.../associations/has_many_association.rb | 4 +-
.../associations/has_one_association.rb | 4 +-
.../join_dependency/join_association.rb | 2 +
.../associations/join_dependency/join_part.rb | 15 +-
.../lib/active_record/associations/preloader.rb | 5 +-
.../lib/active_record/attribute_methods.rb | 28 +-
.../lib/active_record/attribute_methods/read.rb | 24 +-
.../attribute_methods/time_zone_conversion.rb | 2 +-
.../lib/active_record/attribute_methods/write.rb | 2 +
.../lib/active_record/autosave_association.rb | 16 +-
activerecord/lib/active_record/callbacks.rb | 5 +-
.../abstract/database_statements.rb | 14 +-
.../abstract/schema_statements.rb | 15 +-
.../connection_adapters/abstract_adapter.rb | 18 +-
.../connection_adapters/abstract_mysql_adapter.rb | 4 +-
.../active_record/connection_adapters/column.rb | 23 +-
.../connection_adapters/mysql2_adapter.rb | 12 +-
.../connection_adapters/mysql_adapter.rb | 28 +-
.../connection_adapters/postgresql/cast.rb | 2 +-
.../postgresql/database_statements.rb | 13 +-
.../connection_adapters/postgresql/oid.rb | 5 +
.../connection_adapters/postgresql/quoting.rb | 2 +
.../postgresql/schema_statements.rb | 17 +-
.../connection_adapters/postgresql_adapter.rb | 32 +-
.../connection_adapters/sqlite3_adapter.rb | 13 +-
activerecord/lib/active_record/core.rb | 36 +--
activerecord/lib/active_record/dynamic_matchers.rb | 2 +-
activerecord/lib/active_record/fixtures.rb | 4 +-
.../lib/active_record/locking/optimistic.rb | 2 +-
activerecord/lib/active_record/migration.rb | 2 +-
.../active_record/migration/command_recorder.rb | 5 +-
activerecord/lib/active_record/model_schema.rb | 44 +--
activerecord/lib/active_record/null_relation.rb | 6 +-
activerecord/lib/active_record/persistence.rb | 21 +-
activerecord/lib/active_record/railtie.rb | 1 +
.../lib/active_record/railties/databases.rake | 5 +-
activerecord/lib/active_record/reflection.rb | 2 +-
activerecord/lib/active_record/relation.rb | 2 +-
activerecord/lib/active_record/relation/batches.rb | 4 +-
.../lib/active_record/relation/calculations.rb | 1 +
.../lib/active_record/relation/finder_methods.rb | 20 +-
activerecord/lib/active_record/relation/merger.rb | 59 ++--
.../lib/active_record/relation/query_methods.rb | 31 +-
activerecord/lib/active_record/result.rb | 16 +-
activerecord/lib/active_record/sanitization.rb | 16 +-
activerecord/lib/active_record/schema_dumper.rb | 6 +-
.../lib/active_record/tasks/database_tasks.rb | 3 +-
.../active_record/tasks/sqlite_database_tasks.rb | 2 +-
activerecord/lib/active_record/transactions.rb | 10 +-
.../lib/active_record/validations/uniqueness.rb | 4 +-
activerecord/lib/active_record/version.rb | 2 +-
.../cases/adapters/mysql/mysql_adapter_test.rb | 31 +-
.../test/cases/adapters/postgresql/array_test.rb | 12 +
.../cases/adapters/postgresql/datatype_test.rb | 10 +-
.../test/cases/adapters/postgresql/json_test.rb | 13 +
.../adapters/postgresql/postgresql_adapter_test.rb | 70 ++++-
.../test/cases/adapters/postgresql/uuid_test.rb | 52 +++-
.../test/cases/adapters/postgresql/xml_test.rb | 38 +++
.../cases/adapters/sqlite3/sqlite3_adapter_test.rb | 12 +
.../adapters/sqlite3/sqlite3_create_folder_test.rb | 21 ++
.../associations/belongs_to_associations_test.rb | 63 +++-
.../has_and_belongs_to_many_associations_test.rb | 4 +-
.../associations/has_many_associations_test.rb | 76 ++++-
.../has_many_through_associations_test.rb | 6 +
.../associations/has_one_associations_test.rb | 2 +
.../associations/inner_join_association_test.rb | 13 +
.../associations/inverse_associations_test.rb | 39 ++-
activerecord/test/cases/associations_test.rb | 13 +
.../test/cases/attribute_methods/read_test.rb | 7 -
.../test/cases/autosave_association_test.rb | 29 +-
activerecord/test/cases/base_test.rb | 39 +++
activerecord/test/cases/batches_test.rb | 10 +
activerecord/test/cases/disconnected_test.rb | 27 ++
activerecord/test/cases/finder_respond_to_test.rb | 5 +
activerecord/test/cases/finder_test.rb | 58 ++--
activerecord/test/cases/fixtures_test.rb | 4 +-
activerecord/test/cases/inheritance_test.rb | 6 +-
activerecord/test/cases/invalid_connection_test.rb | 22 ++
.../test/cases/invertible_migration_test.rb | 28 ++
activerecord/test/cases/locking_test.rb | 12 +
activerecord/test/cases/reflection_test.rb | 16 +
activerecord/test/cases/relation_test.rb | 25 +-
activerecord/test/cases/relations_test.rb | 79 ++++-
activerecord/test/cases/sanitize_test.rb | 24 ++
activerecord/test/cases/schema_dumper_test.rb | 7 +-
.../test/cases/scoping/default_scoping_test.rb | 8 +-
.../test/cases/serialized_attribute_test.rb | 2 +-
activerecord/test/fixtures/all/admin | 1 +
activerecord/test/fixtures/tasks.yml | 2 +-
.../test/fixtures/to_be_linked/accounts.yml | 2 +
activerecord/test/fixtures/to_be_linked/users.yml | 10 +
activerecord/test/models/author.rb | 13 +-
activerecord/test/models/cake_designer.rb | 3 +
activerecord/test/models/chef.rb | 3 +
activerecord/test/models/company.rb | 11 +-
activerecord/test/models/department.rb | 4 +
activerecord/test/models/drink_designer.rb | 3 +
activerecord/test/models/hotel.rb | 6 +
activerecord/test/models/person.rb | 1 +
activerecord/test/schema/schema.rb | 19 ++
activesupport/CHANGELOG.md | 73 +++++
activesupport/README.rdoc | 2 +-
activesupport/Rakefile | 9 +-
.../lib/active_support/backtrace_cleaner.rb | 6 +-
activesupport/lib/active_support/cache.rb | 2 +-
.../lib/active_support/cache/file_store.rb | 3 +-
.../lib/active_support/cache/memory_store.rb | 16 +-
activesupport/lib/active_support/callbacks.rb | 2 +-
.../active_support/core_ext/date_time/acts_like.rb | 1 +
.../core_ext/date_time/conversions.rb | 10 +
.../active_support/core_ext/module/delegation.rb | 21 +-
activesupport/lib/active_support/core_ext/range.rb | 1 +
.../lib/active_support/core_ext/range/each.rb | 24 ++
.../lib/active_support/core_ext/thread.rb | 21 +-
.../active_support/core_ext/time/calculations.rb | 11 +-
activesupport/lib/active_support/dependencies.rb | 5 +-
.../lib/active_support/deprecation/behaviors.rb | 23 +-
.../lib/active_support/multibyte/unicode.rb | 6 +-
activesupport/lib/active_support/number_helper.rb | 18 +-
activesupport/lib/active_support/rescuable.rb | 1 -
activesupport/lib/active_support/time_with_zone.rb | 6 +-
activesupport/lib/active_support/version.rb | 2 +-
.../test/autoloading_fixtures/html/some_class.rb | 4 +
activesupport/test/caching_test.rb | 40 ++-
activesupport/test/clean_backtrace_test.rb | 21 ++
activesupport/test/core_ext/date_time_ext_test.rb | 10 +
activesupport/test/core_ext/module_test.rb | 27 ++
activesupport/test/core_ext/numeric_ext_test.rb | 2 +-
activesupport/test/core_ext/range_ext_test.rb | 24 +-
activesupport/test/core_ext/thread_test.rb | 9 +
activesupport/test/core_ext/time_ext_test.rb | 54 ++++
activesupport/test/core_ext/time_with_zone_test.rb | 10 +
.../raises_exception_without_blame_file.rb | 5 +
activesupport/test/dependencies_test.rb | 16 +
activesupport/test/deprecation_test.rb | 16 +
activesupport/test/json/encoding_test.rb | 2 +-
activesupport/test/rescuable_test.rb | 2 +-
activesupport/test/ts_isolated.rb | 16 -
activesupport/test/xml_mini/jdom_engine_test.rb | 2 +-
activesupport/test/xml_mini/libxml_engine_test.rb | 3 +-
.../test/xml_mini/libxmlsax_engine_test.rb | 3 +-
.../test/xml_mini/nokogiri_engine_test.rb | 3 +-
.../test/xml_mini/nokogirisax_engine_test.rb | 3 +-
activesupport/test/xml_mini/rexml_engine_test.rb | 3 +-
railties/CHANGELOG.md | 28 ++
railties/RDOC_MAIN.rdoc | 6 +-
railties/README.rdoc | 2 +-
railties/lib/rails/api/task.rb | 8 +
railties/lib/rails/application.rb | 7 +-
railties/lib/rails/application/bootstrap.rb | 3 +-
railties/lib/rails/commands.rb | 18 +-
railties/lib/rails/engine.rb | 2 +-
.../erb/scaffold/templates/_form.html.erb | 5 +
.../rails/generators/rails/app/app_generator.rb | 2 +-
.../rails/generators/rails/app/templates/Gemfile | 2 +-
.../app/views/layouts/application.html.erb.tt | 5 +
.../rails/app/templates/config/routes.rb | 2 +-
.../rails/generators/rails/app/templates/gitignore | 2 +-
.../rails/scaffold/scaffold_generator.rb | 2 +
.../test_unit/model/templates/fixtures.yml | 2 +-
railties/lib/rails/rack/logger.rb | 7 +-
railties/lib/rails/tasks.rb | 2 +-
railties/lib/rails/tasks/documentation.rake | 4 +-
.../rails/templates/rails/welcome/index.html.erb | 4 +-
railties/lib/rails/version.rb | 2 +-
railties/test/application/assets_test.rb | 2 +-
railties/test/application/configuration_test.rb | 8 +
.../test/application/middleware/remote_ip_test.rb | 10 +
railties/test/application/middleware_test.rb | 16 +-
railties/test/application/rake_test.rb | 36 +--
railties/test/application/routing_test.rb | 45 +++
railties/test/generators/app_generator_test.rb | 11 +-
.../test/generators/scaffold_generator_test.rb | 40 ++-
railties/test/rack_logger_test.rb | 2 +-
tools/profile | 1 -
version.rb | 2 +-
311 files changed, 3501 insertions(+), 1435 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/rails-4.0.git
More information about the Pkg-ruby-extras-commits
mailing list