[DRE-commits] [rails] 01/03: Merge tag 'upstream/4.2.3'

Praveen Arimbrathodiyil praveen at moszumanska.debian.org
Tue Jul 28 06:31:53 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 1372e14b21a57ed4915812b0126eae9a459b51da
Merge: 14099f7 08a4dad
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Jul 28 11:21:38 2015 +0530

    Merge tag 'upstream/4.2.3'
    
    Upstream version 4.2.3
    
    # gpg: Signature made Tuesday 28 July 2015 11:21:16 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                                        |   32 +-
 CONTRIBUTING.md                                    |    3 +-
 Gemfile                                            |   45 +-
 Gemfile.lock                                       |  229 +-
 RAILS_VERSION                                      |    2 +-
 README.md                                          |   22 +-
 RELEASING_RAILS.rdoc                               |   16 +-
 Rakefile                                           |    2 +-
 actionmailer/CHANGELOG.md                          |  148 +-
 actionmailer/README.rdoc                           |   48 +-
 actionmailer/Rakefile                              |    1 +
 actionmailer/actionmailer.gemspec                  |    2 +
 actionmailer/lib/action_mailer.rb                  |    3 +
 actionmailer/lib/action_mailer/base.rb             |  122 +-
 actionmailer/lib/action_mailer/delivery_job.rb     |   13 +
 actionmailer/lib/action_mailer/gem_version.rb      |    6 +-
 .../action_mailer/inline_preview_interceptor.rb    |   61 +
 actionmailer/lib/action_mailer/log_subscriber.rb   |   23 +-
 actionmailer/lib/action_mailer/mail_helper.rb      |    4 +-
 actionmailer/lib/action_mailer/message_delivery.rb |  115 +
 actionmailer/lib/action_mailer/preview.rb          |   12 +
 actionmailer/lib/action_mailer/railtie.rb          |   13 +-
 actionmailer/lib/action_mailer/test_case.rb        |   21 +-
 actionmailer/lib/action_mailer/test_helper.rb      |   16 +-
 actionmailer/lib/action_mailer/version.rb          |    3 +-
 .../rails/generators/mailer/mailer_generator.rb    |    3 +
 .../mailer/templates/application_mailer.rb         |    4 +
 .../rails/generators/mailer/templates/mailer.rb    |    3 +-
 actionmailer/test/abstract_unit.rb                 |   44 +-
 actionmailer/test/assert_select_email_test.rb      |   47 +
 actionmailer/test/asset_host_test.rb               |   26 +-
 actionmailer/test/base_test.rb                     |  292 +-
 actionmailer/test/delivery_methods_test.rb         |   90 +-
 .../test/fixtures/test_helper_mailer/welcome       |    1 +
 .../fixtures/url_test_mailer/exercise_url_for.erb  |    1 +
 actionmailer/test/i18n_with_controller_test.rb     |   45 +-
 actionmailer/test/log_subscriber_test.rb           |   10 +-
 actionmailer/test/mail_helper_test.rb              |   14 +-
 actionmailer/test/mail_layout_test.rb              |   10 -
 actionmailer/test/mailers/delayed_mailer.rb        |    6 +
 actionmailer/test/message_delivery_test.rb         |  104 +
 .../test/{test_test.rb => test_case_test.rb}       |    0
 actionmailer/test/test_helper_test.rb              |   42 +-
 actionmailer/test/url_test.rb                      |   66 +-
 actionpack/CHANGELOG.md                            |  919 +++----
 actionpack/README.rdoc                             |    9 +-
 actionpack/RUNNING_UNIT_TESTS.rdoc                 |   17 -
 actionpack/Rakefile                                |   27 +-
 actionpack/actionpack.gemspec                      |    4 +-
 actionpack/lib/abstract_controller/base.rb         |   22 +-
 actionpack/lib/abstract_controller/callbacks.rb    |   79 +-
 actionpack/lib/abstract_controller/helpers.rb      |   15 +-
 .../abstract_controller/railties/routes_helpers.rb |    6 +-
 actionpack/lib/abstract_controller/url_for.rb      |    2 +-
 actionpack/lib/action_controller.rb                |    2 +-
 actionpack/lib/action_controller/base.rb           |    1 +
 actionpack/lib/action_controller/caching.rb        |    2 +-
 .../lib/action_controller/caching/fragments.rb     |    8 +-
 actionpack/lib/action_controller/log_subscriber.rb |   52 +-
 actionpack/lib/action_controller/metal.rb          |   23 +-
 .../lib/action_controller/metal/conditional_get.rb |   49 +-
 .../metal/etag_with_template_digest.rb             |   50 +
 .../lib/action_controller/metal/exceptions.rb      |    2 +-
 .../lib/action_controller/metal/force_ssl.rb       |    2 +-
 actionpack/lib/action_controller/metal/head.rb     |   10 +-
 .../action_controller/metal/http_authentication.rb |   12 +-
 .../lib/action_controller/metal/instrumentation.rb |    2 +-
 actionpack/lib/action_controller/metal/live.rb     |   63 +-
 .../lib/action_controller/metal/mime_responds.rb   |  269 +-
 .../lib/action_controller/metal/params_wrapper.rb  |    4 +-
 .../lib/action_controller/metal/rack_delegation.rb |    2 +-
 .../lib/action_controller/metal/redirecting.rb     |   22 +-
 .../lib/action_controller/metal/renderers.rb       |   40 +-
 .../lib/action_controller/metal/rendering.rb       |    8 +-
 .../metal/request_forgery_protection.rb            |   85 +-
 .../lib/action_controller/metal/responder.rb       |  297 ---
 .../lib/action_controller/metal/streaming.rb       |    2 +-
 .../action_controller/metal/strong_parameters.rb   |  143 +-
 actionpack/lib/action_controller/metal/url_for.rb  |   23 +-
 actionpack/lib/action_controller/model_naming.rb   |    2 +-
 actionpack/lib/action_controller/railtie.rb        |    4 +
 actionpack/lib/action_controller/test_case.rb      |  187 +-
 actionpack/lib/action_dispatch/http/cache.rb       |    9 +-
 .../lib/action_dispatch/http/filter_parameters.rb  |    4 +-
 actionpack/lib/action_dispatch/http/headers.rb     |   52 +-
 .../lib/action_dispatch/http/mime_negotiation.rb   |   11 +-
 actionpack/lib/action_dispatch/http/mime_type.rb   |    4 +-
 actionpack/lib/action_dispatch/http/parameters.rb  |   37 +-
 actionpack/lib/action_dispatch/http/request.rb     |   46 +-
 actionpack/lib/action_dispatch/http/response.rb    |   97 +-
 actionpack/lib/action_dispatch/http/upload.rb      |   11 +-
 actionpack/lib/action_dispatch/http/url.rb         |  159 +-
 .../lib/action_dispatch/journey/formatter.rb       |   50 +-
 .../lib/action_dispatch/journey/gtg/builder.rb     |    6 +-
 .../lib/action_dispatch/journey/gtg/simulator.rb   |   17 +-
 .../journey/gtg/transition_table.rb                |   48 +-
 actionpack/lib/action_dispatch/journey/nfa/dot.rb  |    4 +-
 .../lib/action_dispatch/journey/nfa/simulator.rb   |    2 +-
 .../journey/nfa/transition_table.rb                |   10 +-
 .../lib/action_dispatch/journey/nodes/node.rb      |    4 +
 actionpack/lib/action_dispatch/journey/parser.rb   |  112 +-
 actionpack/lib/action_dispatch/journey/parser.y    |   21 +-
 .../lib/action_dispatch/journey/path/pattern.rb    |   35 +-
 actionpack/lib/action_dispatch/journey/route.rb    |   23 +-
 actionpack/lib/action_dispatch/journey/router.rb   |  129 +-
 .../lib/action_dispatch/journey/router/strexp.rb   |   15 +-
 actionpack/lib/action_dispatch/journey/routes.rb   |    4 +
 actionpack/lib/action_dispatch/journey/scanner.rb  |   10 +-
 actionpack/lib/action_dispatch/journey/visitors.rb |  173 +-
 .../lib/action_dispatch/journey/visualizer/fsm.css |    4 -
 .../journey/visualizer/index.html.erb              |    4 +-
 .../lib/action_dispatch/middleware/callbacks.rb    |    2 +-
 .../lib/action_dispatch/middleware/cookies.rb      |   56 +-
 .../action_dispatch/middleware/debug_exceptions.rb |   19 +-
 .../middleware/exception_wrapper.rb                |   47 +-
 actionpack/lib/action_dispatch/middleware/flash.rb |   18 +-
 .../action_dispatch/middleware/params_parser.rb    |    2 +-
 .../middleware/public_exceptions.rb                |   21 +-
 .../lib/action_dispatch/middleware/remote_ip.rb    |   94 +-
 .../lib/action_dispatch/middleware/request_id.rb   |    2 +-
 .../middleware/session/cookie_store.rb             |    2 +-
 .../action_dispatch/middleware/show_exceptions.rb  |    1 +
 .../lib/action_dispatch/middleware/static.rb       |  106 +-
 .../middleware/templates/rescues/_source.erb       |   40 +-
 .../middleware/templates/rescues/_trace.html.erb   |   46 +-
 .../middleware/templates/rescues/_trace.text.erb   |   10 +-
 .../{diagnostics.erb => diagnostics.html.erb}      |    0
 .../templates/rescues/diagnostics.text.erb         |    9 +
 .../middleware/templates/rescues/layout.erb        |    6 +
 .../templates/rescues/missing_template.html.erb    |    4 +
 .../templates/rescues/routing_error.html.erb       |    2 +
 .../templates/rescues/template_error.html.erb      |   25 +-
 .../templates/rescues/template_error.text.erb      |    1 -
 .../middleware/templates/routes/_table.html.erb    |  184 +-
 actionpack/lib/action_dispatch/railtie.rb          |    2 +
 actionpack/lib/action_dispatch/routing/endpoint.rb |   10 +
 .../lib/action_dispatch/routing/inspector.rb       |   17 +-
 actionpack/lib/action_dispatch/routing/mapper.rb   |  691 +++--
 .../action_dispatch/routing/polymorphic_routes.rb  |  270 +-
 .../lib/action_dispatch/routing/redirection.rb     |   22 +-
 .../lib/action_dispatch/routing/route_set.rb       |  469 ++--
 actionpack/lib/action_dispatch/routing/url_for.rb  |   19 +-
 .../lib/action_dispatch/testing/assertions.rb      |   18 +-
 .../lib/action_dispatch/testing/assertions/dom.rb  |   28 +-
 .../action_dispatch/testing/assertions/response.rb |    9 +-
 .../action_dispatch/testing/assertions/routing.rb  |   30 +-
 .../action_dispatch/testing/assertions/selector.rb |  431 +--
 .../lib/action_dispatch/testing/assertions/tag.rb  |  136 +-
 .../lib/action_dispatch/testing/integration.rb     |   45 +-
 .../lib/action_dispatch/testing/test_request.rb    |    2 +-
 .../lib/action_dispatch/testing/test_response.rb   |   13 +-
 actionpack/lib/action_pack/gem_version.rb          |    6 +-
 actionpack/test/abstract/collector_test.rb         |   16 +-
 actionpack/test/abstract_unit.rb                   |  181 +-
 .../test/controller/action_pack_assertions_test.rb |   43 +-
 actionpack/test/controller/assert_select_test.rb   |  353 ---
 actionpack/test/controller/base_test.rb            |    2 +-
 actionpack/test/controller/caching_test.rb         |   16 +
 actionpack/test/controller/content_type_test.rb    |   32 +-
 actionpack/test/controller/filters_test.rb         |  386 +--
 actionpack/test/controller/flash_test.rb           |   23 +-
 actionpack/test/controller/force_ssl_test.rb       |   15 +-
 actionpack/test/controller/helper_test.rb          |   22 +
 actionpack/test/controller/integration_test.rb     |  123 +-
 actionpack/test/controller/live_stream_test.rb     |  107 +-
 .../test/controller/localized_templates_test.rb    |   18 +-
 actionpack/test/controller/log_subscriber_test.rb  |    2 +-
 .../test/controller/mime/accept_format_test.rb     |    2 -
 actionpack/test/controller/mime/respond_to_test.rb |    6 +-
 .../test/controller/mime/respond_with_test.rb      |  714 -----
 actionpack/test/controller/mime/responders_test.rb |   32 +
 .../test/controller/new_base/bare_metal_test.rb    |    6 +-
 .../test/controller/new_base/render_body_test.rb   |    8 +-
 .../test/controller/new_base/render_file_test.rb   |   29 -
 .../test/controller/new_base/render_html_test.rb   |    8 +-
 .../test/controller/new_base/render_plain_test.rb  |    8 +-
 .../controller/new_base/render_template_test.rb    |   13 +-
 .../test/controller/new_base/render_text_test.rb   |    8 +-
 .../test/controller/parameters/accessors_test.rb   |  125 +
 .../parameters/always_permitted_parameters_test.rb |   29 +
 .../parameters/log_on_unpermitted_params_test.rb   |   30 +-
 .../test/controller/parameters/mutators_test.rb    |   99 +
 .../parameters/parameters_permit_test.rb           |  100 +-
 actionpack/test/controller/params_wrapper_test.rb  |   26 +-
 actionpack/test/controller/render_other_test.rb    |   11 +-
 actionpack/test/controller/render_test.rb          |   70 +-
 .../controller/request_forgery_protection_test.rb  |   83 +-
 actionpack/test/controller/resources_test.rb       |   34 +-
 actionpack/test/controller/routing_test.rb         |  333 ++-
 actionpack/test/controller/selector_test.rb        |  629 -----
 actionpack/test/controller/send_file_test.rb       |    6 +-
 actionpack/test/controller/show_exceptions_test.rb |    2 +-
 actionpack/test/controller/test_case_test.rb       |  339 +--
 .../test/controller/url_for_integration_test.rb    |   81 +-
 actionpack/test/controller/url_for_test.rb         |   90 +-
 actionpack/test/controller/webservice_test.rb      |   10 +
 actionpack/test/dispatch/cookies_test.rb           |   93 +-
 actionpack/test/dispatch/debug_exceptions_test.rb  |   86 +-
 actionpack/test/dispatch/exception_wrapper_test.rb |   97 +
 actionpack/test/dispatch/mapper_test.rb            |    8 +-
 actionpack/test/dispatch/mime_type_test.rb         |    6 +-
 actionpack/test/dispatch/mount_test.rb             |   17 +-
 actionpack/test/dispatch/prefix_generation_test.rb |  132 +-
 actionpack/test/dispatch/rack_test.rb              |  191 --
 actionpack/test/dispatch/reloader_test.rb          |    5 +
 .../request/multipart_params_parsing_test.rb       |   10 +-
 .../dispatch/request/query_string_parsing_test.rb  |    3 +-
 actionpack/test/dispatch/request/session_test.rb   |   41 +-
 .../request/url_encoded_params_parsing_test.rb     |    5 +-
 actionpack/test/dispatch/request_test.rb           |  636 +++--
 actionpack/test/dispatch/response_test.rb          |   40 +-
 actionpack/test/dispatch/routing/concerns_test.rb  |    3 +-
 actionpack/test/dispatch/routing/inspector_test.rb |   44 +-
 actionpack/test/dispatch/routing/route_set_test.rb |  128 +-
 actionpack/test/dispatch/routing_test.rb           |  331 ++-
 .../test/dispatch/session/cookie_store_test.rb     |    6 +-
 .../test/dispatch/session/mem_cache_store_test.rb  |    3 +-
 actionpack/test/dispatch/show_exceptions_test.rb   |   11 +-
 actionpack/test/dispatch/static_test.rb            |  123 +-
 .../test/dispatch/template_assertions_test.rb      |  110 +
 actionpack/test/dispatch/test_request_test.rb      |    2 +-
 actionpack/test/dispatch/uploaded_file_test.rb     |   12 +
 actionpack/test/dispatch/url_generation_test.rb    |    4 +-
 .../fixtures/helpers_typo/admin/users_helper.rb    |    5 +
 actionpack/test/fixtures/public/bar.html           |    1 +
 actionpack/test/fixtures/public/bar/index.html     |    1 +
 ...application-a71b3024f80aea3181c09774ca17e712.js |    4 +
 ...lication-a71b3024f80aea3181c09774ca17e712.js.gz |  Bin 0 -> 38457 bytes
 actionpack/test/fixtures/public/gzip/foo.zoo       |    4 +
 actionpack/test/fixtures/public/gzip/foo.zoo.gz    |  Bin 0 -> 38457 bytes
 .../test/fixtures/respond_with/edit.html.erb       |    1 -
 actionpack/test/fixtures/respond_with/new.html.erb |    1 -
 .../using_invalid_resource_with_template.xml.erb   |    1 -
 .../using_options_with_template.xml.erb            |    1 -
 .../fixtures/respond_with/using_resource.js.erb    |    1 -
 .../using_resource_with_block.html.erb             |    1 -
 .../test/fixtures/test/_changing_priority.html.erb |    1 -
 .../test/fixtures/test/_changing_priority.json.erb |    1 -
 actionpack/test/fixtures/test/_counter.html.erb    |    1 -
 actionpack/test/fixtures/test/_customer.erb        |    1 -
 .../test/fixtures/test/_customer_counter.erb       |    1 -
 .../fixtures/test/_customer_counter_with_as.erb    |    1 -
 .../test/fixtures/test/_customer_greeting.erb      |    1 -
 .../test/fixtures/test/_customer_with_var.erb      |    1 -
 .../test/_directory/_partial_with_locales.html.erb |    1 -
 .../fixtures/test/_first_json_partial.json.erb     |    1 -
 actionpack/test/fixtures/test/_form.erb            |    1 -
 actionpack/test/fixtures/test/_hash_greeting.erb   |    1 -
 actionpack/test/fixtures/test/_hash_object.erb     |    2 -
 actionpack/test/fixtures/test/_hello.builder       |    1 -
 .../fixtures/test/_json_change_priority.json.erb   |    0
 actionpack/test/fixtures/test/_labelling_form.erb  |    1 -
 .../fixtures/test/_layout_for_partial.html.erb     |    3 -
 .../test/_partial_for_use_in_layout.html.erb       |    1 -
 .../test/fixtures/test/_partial_html_erb.html.erb  |    1 -
 .../fixtures/test/_partial_name_local_variable.erb |    1 -
 actionpack/test/fixtures/test/_partial_only.erb    |    1 -
 .../test/fixtures/test/_partial_only_html.html     |    1 -
 .../test/fixtures/test/_partial_with_partial.erb   |    2 -
 actionpack/test/fixtures/test/_person.erb          |    2 -
 .../test/fixtures/test/_raise_indentation.html.erb |   13 -
 .../fixtures/test/_second_json_partial.json.erb    |    1 -
 .../test/fixtures/test/action_talk_to_layout.erb   |    2 -
 .../test/calling_partial_with_layout.html.erb      |    1 -
 actionpack/test/fixtures/test/capturing.erb        |    4 -
 .../test/fixtures/test/change_priority.html.erb    |    2 -
 actionpack/test/fixtures/test/content_for.erb      |    1 -
 .../fixtures/test/content_for_concatenated.erb     |    3 -
 .../fixtures/test/content_for_with_parameter.erb   |    2 -
 .../test/fixtures/test/formatted_html_erb.html.erb |    1 -
 actionpack/test/fixtures/test/greeting.html.erb    |    1 -
 actionpack/test/fixtures/test/greeting.xml.erb     |    1 -
 actionpack/test/fixtures/test/hello,world.erb      |    1 -
 actionpack/test/fixtures/test/hello.builder        |    4 -
 .../fixtures/test/hello_world_container.builder    |    3 -
 .../fixtures/test/hello_world_from_rxml.builder    |    3 -
 .../test/hello_world_with_layout_false.erb         |    1 -
 .../test/fixtures/test/html_template.html.erb      |    1 -
 actionpack/test/fixtures/test/hyphen-ated.erb      |    1 -
 actionpack/test/fixtures/test/list.erb             |    1 -
 .../test/non_erb_block_content_for.builder         |    4 -
 .../test/fixtures/test/potential_conflicts.erb     |    4 -
 .../test/fixtures/test/proper_block_detection.erb  |    1 -
 .../test/render_file_from_template.html.erb        |    1 -
 .../test/render_file_with_locals_and_default.erb   |    1 -
 ...icit_html_template_from_xhr_request.da.html.erb |    1 -
 ...mplicit_html_template_from_xhr_request.html.erb |    1 -
 ...nder_implicit_js_template_without_layout.js.erb |    1 -
 .../test/render_partial_inside_directory.html.erb  |    1 -
 .../test/fixtures/test/render_to_string_test.erb   |    1 -
 .../fixtures/test/render_two_partials.html.erb     |    2 -
 .../test/using_layout_around_block.html.erb        |    1 -
 .../test/fixtures/test/with_html_partial.html.erb  |    1 -
 .../test/fixtures/test/with_partial.html.erb       |    1 -
 .../test/fixtures/test/with_partial.text.erb       |    1 -
 .../test/fixtures/test/with_xml_template.html.erb  |    1 -
 .../fixtures/\345\205\254\345\205\261/bar.html"    |    1 +
 .../\345\205\254\345\205\261/bar/index.html"       |    1 +
 ...pplication-a71b3024f80aea3181c09774ca17e712.js" |    4 +
 ...ication-a71b3024f80aea3181c09774ca17e712.js.gz" |  Bin 0 -> 38457 bytes
 .../\345\205\254\345\205\261/gzip/foo.zoo"         |    4 +
 .../\345\205\254\345\205\261/gzip/foo.zoo.gz"      |  Bin 0 -> 38457 bytes
 actionpack/test/journey/path/pattern_test.rb       |   46 +-
 .../test/journey/route/definition/scanner_test.rb  |   25 +-
 actionpack/test/journey/route_test.rb              |   30 +-
 actionpack/test/journey/router/strexp_test.rb      |   32 -
 actionpack/test/journey/router_test.rb             |  249 +-
 actionpack/test/journey/routes_test.rb             |   12 +-
 actionpack/test/lib/controller/fake_models.rb      |   45 -
 actionpack/test/routing/helper_test.rb             |   14 +
 actionview/CHANGELOG.md                            |  489 +---
 actionview/README.rdoc                             |    9 +-
 actionview/RUNNING_UNIT_TESTS.rdoc                 |    6 +-
 actionview/Rakefile                                |    3 +
 actionview/actionview.gemspec                      |    2 +
 actionview/lib/action_view.rb                      |    1 -
 actionview/lib/action_view/base.rb                 |   22 +-
 actionview/lib/action_view/buffers.rb              |    7 +-
 actionview/lib/action_view/digestor.rb             |    5 +-
 actionview/lib/action_view/gem_version.rb          |    6 +-
 .../lib/action_view/helpers/asset_tag_helper.rb    |   57 +-
 .../lib/action_view/helpers/asset_url_helper.rb    |   45 +-
 actionview/lib/action_view/helpers/cache_helper.rb |    8 +-
 .../lib/action_view/helpers/capture_helper.rb      |   13 +-
 actionview/lib/action_view/helpers/date_helper.rb  |   32 +-
 actionview/lib/action_view/helpers/debug_helper.rb |   18 +-
 actionview/lib/action_view/helpers/form_helper.rb  |  113 +-
 .../lib/action_view/helpers/form_options_helper.rb |    8 +-
 .../lib/action_view/helpers/form_tag_helper.rb     |  180 +-
 .../lib/action_view/helpers/javascript_helper.rb   |    8 +-
 .../lib/action_view/helpers/number_helper.rb       |   28 +-
 .../action_view/helpers/output_safety_helper.rb    |   12 +-
 .../lib/action_view/helpers/rendering_helper.rb    |   12 +-
 .../lib/action_view/helpers/sanitize_helper.rb     |  226 +-
 actionview/lib/action_view/helpers/tag_helper.rb   |   34 +-
 actionview/lib/action_view/helpers/tags.rb         |    1 +
 actionview/lib/action_view/helpers/tags/base.rb    |   11 +-
 .../helpers/tags/collection_check_boxes.rb         |    6 +-
 .../action_view/helpers/tags/collection_helpers.rb |    2 +-
 .../lib/action_view/helpers/tags/datetime_field.rb |   12 +-
 actionview/lib/action_view/helpers/tags/label.rb   |   58 +-
 .../action_view/helpers/tags/placeholderable.rb    |   22 +
 .../lib/action_view/helpers/tags/search_field.rb   |   20 +-
 .../lib/action_view/helpers/tags/text_area.rb      |    4 +
 .../lib/action_view/helpers/tags/text_field.rb     |    6 +-
 .../lib/action_view/helpers/tags/translator.rb     |   40 +
 actionview/lib/action_view/helpers/text_helper.rb  |   35 +-
 .../lib/action_view/helpers/translation_helper.rb  |   15 +-
 actionview/lib/action_view/helpers/url_helper.rb   |   66 +-
 actionview/lib/action_view/log_subscriber.rb       |   10 +-
 actionview/lib/action_view/lookup_context.rb       |   14 +-
 actionview/lib/action_view/model_naming.rb         |    2 +-
 .../lib/action_view/renderer/abstract_renderer.rb  |    6 +-
 .../lib/action_view/renderer/partial_renderer.rb   |  104 +-
 .../lib/action_view/renderer/template_renderer.rb  |   11 +-
 actionview/lib/action_view/rendering.rb            |   13 +-
 actionview/lib/action_view/routing_url_for.rb      |   37 +-
 actionview/lib/action_view/tasks/dependencies.rake |   16 +-
 actionview/lib/action_view/template.rb             |   28 +-
 actionview/lib/action_view/template/handlers.rb    |   11 +-
 .../lib/action_view/template/handlers/erb.rb       |    6 +-
 .../lib/action_view/template/handlers/raw.rb       |    2 +-
 actionview/lib/action_view/template/resolver.rb    |   17 +-
 actionview/lib/action_view/test_case.rb            |   20 +-
 actionview/lib/action_view/vendor/html-scanner.rb  |   20 -
 .../vendor/html-scanner/html/document.rb           |   68 -
 .../action_view/vendor/html-scanner/html/node.rb   |  532 ----
 .../vendor/html-scanner/html/sanitizer.rb          |  188 --
 .../vendor/html-scanner/html/selector.rb           |  830 ------
 .../vendor/html-scanner/html/tokenizer.rb          |  107 -
 .../vendor/html-scanner/html/version.rb            |   11 -
 actionview/lib/action_view/view_paths.rb           |   45 +-
 actionview/test/abstract_unit.rb                   |   10 +-
 .../abstract/abstract_controller_test.rb           |   48 +
 actionview/test/actionpack/abstract/render_test.rb |   16 +-
 .../test/actionpack/controller/layout_test.rb      |   33 +-
 .../test/actionpack/controller/render_test.rb      |   53 +-
 actionview/test/active_record_unit.rb              |    2 +-
 .../test/activerecord/controller_runtime_test.rb   |    6 +-
 actionview/test/activerecord/debug_helper_test.rb  |    8 +
 .../activerecord/form_helper_activerecord_test.rb  |    9 +-
 .../test/activerecord/polymorphic_routes_test.rb   |  289 +-
 .../actionpack/test/_customer_iteration.erb        |    1 +
 .../test/_customer_iteration_with_as.erb           |    1 +
 .../fixtures/layouts/streaming_with_capture.erb    |    6 +
 .../test/fixtures/test/_label_with_block.erb       |    2 +-
 actionview/test/fixtures/test/nil_return.erb       |    1 +
 actionview/test/lib/controller/fake_models.rb      |   16 +
 actionview/test/template/asset_tag_helper_test.rb  |   34 +-
 actionview/test/template/atom_feed_helper_test.rb  |   10 +-
 actionview/test/template/capture_helper_test.rb    |   23 -
 .../test/template/compiled_templates_test.rb       |   11 +-
 actionview/test/template/date_helper_test.rb       |   31 +-
 actionview/test/template/debug_helper_test.rb      |    8 -
 .../test/template/dependency_tracker_test.rb       |    1 +
 actionview/test/template/digestor_test.rb          |   21 +
 .../test/template/form_collections_helper_test.rb  |  119 +-
 actionview/test/template/form_helper_test.rb       |  580 +++-
 actionview/test/template/form_tag_helper_test.rb   |   22 +-
 .../test/template/html-scanner/cdata_node_test.rb  |   15 -
 .../test/template/html-scanner/document_test.rb    |  148 -
 actionview/test/template/html-scanner/node_test.rb |   89 -
 .../test/template/html-scanner/sanitizer_test.rb   |  330 ---
 .../test/template/html-scanner/tag_node_test.rb    |  243 --
 .../test/template/html-scanner/text_node_test.rb   |   50 -
 .../test/template/html-scanner/tokenizer_test.rb   |  131 -
 actionview/test/template/javascript_helper_test.rb |    6 +-
 actionview/test/template/number_helper_test.rb     |    6 +
 actionview/test/template/output_buffer_test.rb     |   59 -
 .../test/template/output_safety_helper_test.rb     |    9 +-
 actionview/test/template/partial_iteration_test.rb |   33 +
 actionview/test/template/render_test.rb            |   47 +-
 actionview/test/template/sanitize_helper_test.rb   |   24 +-
 actionview/test/template/streaming_render_test.rb  |    4 +
 actionview/test/template/tag_helper_test.rb        |   31 +
 actionview/test/template/test_case_test.rb         |   16 +-
 actionview/test/template/test_test.rb              |   18 +-
 actionview/test/template/text_helper_test.rb       |   33 +-
 .../test/template/translation_helper_test.rb       |   35 +-
 actionview/test/template/url_helper_test.rb        |   52 +-
 activejob/.gitignore                               |    1 +
 activejob/CHANGELOG.md                             |   26 +
 activejob/MIT-LICENSE                              |   21 +
 activejob/README.md                                |  131 +
 activejob/Rakefile                                 |   90 +
 activejob/activejob.gemspec                        |   23 +
 activejob/lib/active_job.rb                        |   37 +
 activejob/lib/active_job/arguments.rb              |  144 +
 activejob/lib/active_job/base.rb                   |   66 +
 activejob/lib/active_job/callbacks.rb              |  146 +
 activejob/lib/active_job/configured_job.rb         |   16 +
 activejob/lib/active_job/core.rb                   |   88 +
 activejob/lib/active_job/enqueuing.rb              |   77 +
 activejob/lib/active_job/execution.rb              |   42 +
 activejob/lib/active_job/gem_version.rb            |   15 +
 activejob/lib/active_job/logging.rb                |  107 +
 activejob/lib/active_job/queue_adapter.rb          |   35 +
 activejob/lib/active_job/queue_adapters.rb         |   51 +
 .../queue_adapters/backburner_adapter.rb           |   36 +
 .../queue_adapters/delayed_job_adapter.rb          |   39 +
 .../active_job/queue_adapters/inline_adapter.rb    |   23 +
 .../lib/active_job/queue_adapters/qu_adapter.rb    |   42 +
 .../lib/active_job/queue_adapters/que_adapter.rb   |   35 +
 .../queue_adapters/queue_classic_adapter.rb        |   54 +
 .../active_job/queue_adapters/resque_adapter.rb    |   52 +
 .../active_job/queue_adapters/sidekiq_adapter.rb   |   47 +
 .../active_job/queue_adapters/sneakers_adapter.rb  |   46 +
 .../queue_adapters/sucker_punch_adapter.rb         |   40 +
 .../lib/active_job/queue_adapters/test_adapter.rb  |   51 +
 activejob/lib/active_job/queue_name.rb             |   51 +
 activejob/lib/active_job/railtie.rb                |   23 +
 activejob/lib/active_job/test_case.rb              |    7 +
 activejob/lib/active_job/test_helper.rb            |  230 ++
 activejob/lib/active_job/version.rb                |    8 +
 .../lib/rails/generators/job/job_generator.rb      |   24 +
 .../lib/rails/generators/job/templates/job.rb      |    9 +
 activejob/test/adapters/backburner.rb              |    3 +
 activejob/test/adapters/delayed_job.rb             |    7 +
 activejob/test/adapters/inline.rb                  |    1 +
 activejob/test/adapters/qu.rb                      |    3 +
 activejob/test/adapters/que.rb                     |    4 +
 activejob/test/adapters/queue_classic.rb           |    2 +
 activejob/test/adapters/resque.rb                  |    2 +
 activejob/test/adapters/sidekiq.rb                 |    2 +
 activejob/test/adapters/sneakers.rb                |    2 +
 activejob/test/adapters/sucker_punch.rb            |    2 +
 activejob/test/adapters/test.rb                    |    3 +
 activejob/test/cases/adapter_test.rb               |    7 +
 .../test/cases/argument_serialization_test.rb      |  105 +
 activejob/test/cases/callbacks_test.rb             |   23 +
 activejob/test/cases/job_serialization_test.rb     |   15 +
 activejob/test/cases/logging_test.rb               |  114 +
 activejob/test/cases/queue_naming_test.rb          |  102 +
 activejob/test/cases/queuing_test.rb               |   44 +
 activejob/test/cases/rescue_test.rb                |   34 +
 activejob/test/cases/test_case_test.rb             |   14 +
 activejob/test/cases/test_helper_test.rb           |  287 ++
 activejob/test/helper.rb                           |   29 +
 activejob/test/integration/queuing_test.rb         |   60 +
 activejob/test/jobs/callback_job.rb                |   29 +
 activejob/test/jobs/gid_job.rb                     |    8 +
 activejob/test/jobs/hello_job.rb                   |    7 +
 activejob/test/jobs/kwargs_job.rb                  |    7 +
 activejob/test/jobs/logging_job.rb                 |   10 +
 activejob/test/jobs/nested_job.rb                  |   10 +
 activejob/test/jobs/rescue_job.rb                  |   27 +
 activejob/test/models/person.rb                    |   20 +
 activejob/test/support/backburner/inline.rb        |    8 +
 .../support/delayed_job/delayed/backend/test.rb    |  113 +
 .../delayed_job/delayed/serialization/test.rb      |    0
 .../support/integration/adapters/backburner.rb     |   38 +
 .../support/integration/adapters/delayed_job.rb    |   20 +
 .../test/support/integration/adapters/inline.rb    |   15 +
 activejob/test/support/integration/adapters/qu.rb  |   38 +
 activejob/test/support/integration/adapters/que.rb |   37 +
 .../support/integration/adapters/queue_classic.rb  |   39 +
 .../test/support/integration/adapters/resque.rb    |   49 +
 .../test/support/integration/adapters/sidekiq.rb   |   57 +
 .../test/support/integration/adapters/sneakers.rb  |   90 +
 .../support/integration/adapters/sucker_punch.rb   |    6 +
 .../test/support/integration/dummy_app_template.rb |   21 +
 activejob/test/support/integration/helper.rb       |   30 +
 activejob/test/support/integration/jobs_manager.rb |   27 +
 .../test/support/integration/test_case_helpers.rb  |   48 +
 activejob/test/support/job_buffer.rb               |   19 +
 activejob/test/support/que/inline.rb               |    9 +
 activejob/test/support/queue_classic/inline.rb     |   23 +
 activejob/test/support/sneakers/inline.rb          |   12 +
 activemodel/CHANGELOG.md                           |  131 +-
 activemodel/README.rdoc                            |   88 +-
 activemodel/Rakefile                               |    1 +
 activemodel/examples/validations.rb                |   30 -
 activemodel/lib/active_model/attribute_methods.rb  |   10 +-
 activemodel/lib/active_model/callbacks.rb          |    3 +
 activemodel/lib/active_model/conversion.rb         |   21 +-
 activemodel/lib/active_model/dirty.rb              |  106 +-
 activemodel/lib/active_model/errors.rb             |   17 +-
 activemodel/lib/active_model/gem_version.rb        |    6 +-
 activemodel/lib/active_model/lint.rb               |   11 +-
 activemodel/lib/active_model/locale/en.yml         |   12 +-
 activemodel/lib/active_model/model.rb              |   20 +-
 activemodel/lib/active_model/naming.rb             |   23 +-
 activemodel/lib/active_model/secure_password.rb    |   39 +-
 activemodel/lib/active_model/serialization.rb      |   16 +-
 activemodel/lib/active_model/serializers/json.rb   |   10 +-
 activemodel/lib/active_model/serializers/xml.rb    |    2 +-
 activemodel/lib/active_model/validations.rb        |   29 +-
 .../lib/active_model/validations/callbacks.rb      |    6 +-
 .../lib/active_model/validations/confirmation.rb   |    2 +-
 activemodel/lib/active_model/validations/format.rb |    2 +-
 .../lib/active_model/validations/numericality.rb   |   27 +-
 .../lib/active_model/validations/validates.rb      |    8 +-
 activemodel/lib/active_model/validations/with.rb   |    7 +-
 activemodel/lib/active_model/validator.rb          |   16 -
 activemodel/test/cases/attribute_methods_test.rb   |   76 +-
 activemodel/test/cases/conversion_test.rb          |    4 +
 activemodel/test/cases/dirty_test.rb               |   51 +-
 activemodel/test/cases/errors_test.rb              |   11 +
 activemodel/test/cases/helper.rb                   |    7 +
 activemodel/test/cases/naming_test.rb              |    6 +
 activemodel/test/cases/secure_password_test.rb     |   96 +-
 .../cases/serializers/json_serialization_test.rb   |   70 +-
 .../cases/serializers/xml_serialization_test.rb    |   78 +-
 activemodel/test/cases/translation_test.rb         |    4 +
 .../cases/validations/absence_validation_test.rb   |    7 +-
 .../validations/confirmation_validation_test.rb    |   35 +-
 .../i18n_generate_message_validation_test.rb       |   18 +-
 .../test/cases/validations/i18n_validation_test.rb |    1 +
 .../validations/numericality_validation_test.rb    |   17 +
 .../test/cases/validations/validates_test.rb       |    1 -
 activemodel/test/cases/validations_test.rb         |  100 +-
 activemodel/test/models/automobile.rb              |   13 -
 activemodel/test/models/contact.rb                 |   15 +
 activemodel/test/models/user.rb                    |    1 -
 activemodel/test/models/visitor.rb                 |    1 -
 activerecord/CHANGELOG.md                          | 2815 +++++++-------------
 activerecord/README.rdoc                           |   25 +-
 activerecord/RUNNING_UNIT_TESTS.rdoc               |    4 +-
 activerecord/Rakefile                              |  210 +-
 activerecord/activerecord.gemspec                  |    2 +-
 activerecord/lib/active_record.rb                  |    3 +
 activerecord/lib/active_record/aggregations.rb     |   20 +-
 .../lib/active_record/association_relation.rb      |   13 +
 activerecord/lib/active_record/associations.rb     |  207 +-
 .../active_record/associations/alias_tracker.rb    |   15 +-
 .../lib/active_record/associations/association.rb  |    2 +-
 .../associations/association_scope.rb              |  120 +-
 .../associations/belongs_to_association.rb         |   38 +-
 .../associations/builder/association.rb            |   21 +-
 .../associations/builder/belongs_to.rb             |   36 +-
 .../associations/builder/collection_association.rb |    6 +-
 .../builder/has_and_belongs_to_many.rb             |   17 +-
 .../active_record/associations/builder/has_many.rb |    2 +-
 .../active_record/associations/builder/has_one.rb  |    4 +-
 .../associations/builder/singular_association.rb   |    9 +-
 .../associations/collection_association.rb         |   79 +-
 .../active_record/associations/collection_proxy.rb |   60 +-
 .../associations/foreign_association.rb            |   11 +
 .../associations/has_many_association.rb           |   96 +-
 .../associations/has_many_through_association.rb   |   64 +-
 .../associations/has_one_association.rb            |    2 +-
 .../active_record/associations/join_dependency.rb  |   37 +-
 .../join_dependency/join_association.rb            |   32 +-
 .../associations/join_dependency/join_part.rb      |    1 -
 .../lib/active_record/associations/preloader.rb    |   58 +-
 .../associations/preloader/association.rb          |   19 +-
 .../associations/preloader/through_association.rb  |    7 +-
 .../associations/singular_association.rb           |   23 +-
 .../associations/through_association.rb            |   13 +-
 activerecord/lib/active_record/attribute.rb        |  163 ++
 .../lib/active_record/attribute_assignment.rb      |   30 +-
 .../lib/active_record/attribute_decorators.rb      |   66 +
 .../lib/active_record/attribute_methods.rb         |  142 +-
 .../attribute_methods/before_type_cast.rb          |    9 +-
 .../lib/active_record/attribute_methods/dirty.rb   |  149 +-
 .../active_record/attribute_methods/primary_key.rb |   15 +-
 .../lib/active_record/attribute_methods/query.rb   |    2 +-
 .../lib/active_record/attribute_methods/read.rb    |   81 +-
 .../attribute_methods/serialization.rb             |  166 +-
 .../attribute_methods/time_zone_conversion.rb      |   78 +-
 .../lib/active_record/attribute_methods/write.rb   |   31 +-
 activerecord/lib/active_record/attribute_set.rb    |   77 +
 .../lib/active_record/attribute_set/builder.rb     |   96 +
 activerecord/lib/active_record/attributes.rb       |  146 +
 .../lib/active_record/autosave_association.rb      |   40 +-
 activerecord/lib/active_record/base.rb             |   37 +-
 activerecord/lib/active_record/callbacks.rb        |    2 +-
 .../abstract/connection_pool.rb                    |  130 +-
 .../abstract/database_statements.rb                |   93 +-
 .../connection_adapters/abstract/query_cache.rb    |    2 +-
 .../connection_adapters/abstract/quoting.rb        |  119 +-
 .../connection_adapters/abstract/savepoints.rb     |    2 +-
 .../abstract/schema_creation.rb                    |   43 +-
 .../abstract/schema_definitions.rb                 |  194 +-
 .../connection_adapters/abstract/schema_dumper.rb  |   48 +-
 .../abstract/schema_statements.rb                  |  310 ++-
 .../connection_adapters/abstract/transaction.rb    |  243 +-
 .../connection_adapters/abstract_adapter.rb        |  217 +-
 .../connection_adapters/abstract_mysql_adapter.rb  |  385 ++-
 .../active_record/connection_adapters/column.rb    |  267 +-
 .../connection_specification.rb                    |   39 +-
 .../connection_adapters/mysql2_adapter.rb          |   40 +-
 .../connection_adapters/mysql_adapter.rb           |  210 +-
 .../connection_adapters/postgresql/array_parser.rb |   42 +-
 .../connection_adapters/postgresql/cast.rb         |  168 --
 .../connection_adapters/postgresql/column.rb       |   20 +
 .../postgresql/database_statements.rb              |   65 +-
 .../connection_adapters/postgresql/oid.rb          |  417 +--
 .../connection_adapters/postgresql/oid/array.rb    |   99 +
 .../connection_adapters/postgresql/oid/bit.rb      |   52 +
 .../postgresql/oid/bit_varying.rb                  |   13 +
 .../connection_adapters/postgresql/oid/bytea.rb    |   15 +
 .../connection_adapters/postgresql/oid/cidr.rb     |   46 +
 .../connection_adapters/postgresql/oid/date.rb     |   11 +
 .../postgresql/oid/date_time.rb                    |   36 +
 .../connection_adapters/postgresql/oid/decimal.rb  |   13 +
 .../connection_adapters/postgresql/oid/enum.rb     |   19 +
 .../connection_adapters/postgresql/oid/float.rb    |   21 +
 .../connection_adapters/postgresql/oid/hstore.rb   |   59 +
 .../connection_adapters/postgresql/oid/inet.rb     |   13 +
 .../connection_adapters/postgresql/oid/infinity.rb |   13 +
 .../connection_adapters/postgresql/oid/integer.rb  |   11 +
 .../connection_adapters/postgresql/oid/json.rb     |   35 +
 .../connection_adapters/postgresql/oid/jsonb.rb    |   23 +
 .../connection_adapters/postgresql/oid/money.rb    |   43 +
 .../connection_adapters/postgresql/oid/point.rb    |   43 +
 .../connection_adapters/postgresql/oid/range.rb    |   79 +
 .../postgresql/oid/specialized_string.rb           |   19 +
 .../connection_adapters/postgresql/oid/time.rb     |   11 +
 .../postgresql/oid/type_map_initializer.rb         |  109 +
 .../connection_adapters/postgresql/oid/uuid.rb     |   21 +
 .../connection_adapters/postgresql/oid/vector.rb   |   26 +
 .../connection_adapters/postgresql/oid/xml.rb      |   28 +
 .../connection_adapters/postgresql/quoting.rb      |  182 +-
 .../postgresql/referential_integrity.rb            |    8 +-
 .../postgresql/schema_definitions.rb               |  152 ++
 .../postgresql/schema_statements.rb                |  159 +-
 .../connection_adapters/postgresql/utils.rb        |   77 +
 .../connection_adapters/postgresql_adapter.rb      |  693 ++---
 .../connection_adapters/schema_cache.rb            |   42 +-
 .../connection_adapters/sqlite3_adapter.rb         |  122 +-
 .../lib/active_record/connection_handling.rb       |    2 +-
 activerecord/lib/active_record/core.rb             |  196 +-
 activerecord/lib/active_record/counter_cache.rb    |   66 +-
 activerecord/lib/active_record/enum.rb             |   17 +-
 activerecord/lib/active_record/errors.rb           |   76 +-
 activerecord/lib/active_record/explain.rb          |    2 +-
 .../lib/active_record/explain_subscriber.rb        |    2 +-
 activerecord/lib/active_record/fixtures.rb         |  136 +-
 activerecord/lib/active_record/gem_version.rb      |    6 +-
 activerecord/lib/active_record/inheritance.rb      |   45 +-
 activerecord/lib/active_record/integration.rb      |    8 +-
 .../lib/active_record/locking/optimistic.rb        |   72 +-
 activerecord/lib/active_record/migration.rb        |   76 +-
 .../active_record/migration/command_recorder.rb    |   21 +-
 .../lib/active_record/migration/join_table.rb      |    2 +-
 activerecord/lib/active_record/model_schema.rb     |  106 +-
 .../lib/active_record/nested_attributes.rb         |   12 +-
 activerecord/lib/active_record/no_touching.rb      |    2 +-
 activerecord/lib/active_record/persistence.rb      |   72 +-
 activerecord/lib/active_record/query_cache.rb      |    6 +-
 activerecord/lib/active_record/querying.rb         |   17 +-
 activerecord/lib/active_record/railtie.rb          |   23 +-
 .../lib/active_record/railties/databases.rake      |   86 +-
 .../lib/active_record/readonly_attributes.rb       |    1 -
 activerecord/lib/active_record/reflection.rb       |  335 ++-
 activerecord/lib/active_record/relation.rb         |   79 +-
 activerecord/lib/active_record/relation/batches.rb |    2 -
 .../lib/active_record/relation/calculations.rb     |   65 +-
 .../lib/active_record/relation/delegation.rb       |    2 +-
 .../lib/active_record/relation/finder_methods.rb   |  119 +-
 activerecord/lib/active_record/relation/merger.rb  |   43 +-
 .../active_record/relation/predicate_builder.rb    |   34 +-
 .../relation/predicate_builder/array_handler.rb    |   44 +-
 .../relation/predicate_builder/relation_handler.rb |    6 +-
 .../lib/active_record/relation/query_methods.rb    |  173 +-
 .../lib/active_record/relation/spawn_methods.rb    |    3 +
 activerecord/lib/active_record/result.rb           |   25 +-
 activerecord/lib/active_record/sanitization.rb     |   14 +-
 activerecord/lib/active_record/schema.rb           |    1 -
 activerecord/lib/active_record/schema_dumper.rb    |   87 +-
 activerecord/lib/active_record/schema_migration.rb |    4 +
 activerecord/lib/active_record/scoping/default.rb  |    9 +-
 activerecord/lib/active_record/scoping/named.rb    |    4 +
 .../active_record/serializers/xml_serializer.rb    |   10 +-
 activerecord/lib/active_record/statement_cache.rb  |  105 +-
 activerecord/lib/active_record/store.rb            |   10 +-
 .../lib/active_record/tasks/database_tasks.rb      |   64 +-
 .../active_record/tasks/mysql_database_tasks.rb    |    3 +-
 .../tasks/postgresql_database_tasks.rb             |    2 +-
 activerecord/lib/active_record/timestamp.rb        |   16 +-
 activerecord/lib/active_record/transactions.rb     |   76 +-
 activerecord/lib/active_record/type.rb             |   23 +
 activerecord/lib/active_record/type/big_integer.rb |   13 +
 activerecord/lib/active_record/type/binary.rb      |   50 +
 activerecord/lib/active_record/type/boolean.rb     |   31 +
 activerecord/lib/active_record/type/date.rb        |   46 +
 activerecord/lib/active_record/type/date_time.rb   |   54 +
 activerecord/lib/active_record/type/decimal.rb     |   48 +
 .../active_record/type/decimal_without_scale.rb    |   11 +
 activerecord/lib/active_record/type/decorator.rb   |   14 +
 activerecord/lib/active_record/type/float.rb       |   19 +
 .../lib/active_record/type/hash_lookup_type_map.rb |   23 +
 activerecord/lib/active_record/type/integer.rb     |   59 +
 activerecord/lib/active_record/type/mutable.rb     |   16 +
 activerecord/lib/active_record/type/numeric.rb     |   36 +
 activerecord/lib/active_record/type/serialized.rb  |   62 +
 activerecord/lib/active_record/type/string.rb      |   40 +
 activerecord/lib/active_record/type/text.rb        |   11 +
 activerecord/lib/active_record/type/time.rb        |   26 +
 activerecord/lib/active_record/type/time_value.rb  |   38 +
 activerecord/lib/active_record/type/type_map.rb    |   64 +
 .../lib/active_record/type/unsigned_integer.rb     |   15 +
 activerecord/lib/active_record/type/value.rb       |  105 +
 activerecord/lib/active_record/validations.rb      |   44 +-
 .../lib/active_record/validations/associated.rb    |    8 +-
 .../lib/active_record/validations/presence.rb      |    8 +-
 .../lib/active_record/validations/uniqueness.rb    |   48 +-
 .../active_record/migration/migration_generator.rb |   12 +-
 .../migration/templates/create_table_migration.rb  |    2 +-
 .../active_record/model/templates/model.rb         |    2 +-
 .../connection_adapters/fake_adapter.rb            |    1 +
 activerecord/test/cases/adapter_test.rb            |   38 +-
 .../cases/adapters/mysql/active_schema_test.rb     |   32 +-
 .../cases/adapters/mysql/case_sensitivity_test.rb  |   24 +-
 .../test/cases/adapters/mysql/connection_test.rb   |   98 +-
 .../test/cases/adapters/mysql/consistency_test.rb  |   49 +
 .../test/cases/adapters/mysql/datetime_test.rb     |   87 +
 .../cases/adapters/mysql/mysql_adapter_test.rb     |  114 +-
 .../test/cases/adapters/mysql/quoting_test.rb      |    4 +-
 .../cases/adapters/mysql/reserved_word_test.rb     |    2 +-
 .../cases/adapters/mysql/unsigned_type_test.rb     |   30 +
 .../cases/adapters/mysql2/active_schema_test.rb    |   32 +-
 .../test/cases/adapters/mysql2/boolean_test.rb     |    5 +-
 .../cases/adapters/mysql2/case_sensitivity_test.rb |   24 +-
 .../test/cases/adapters/mysql2/connection_test.rb  |   39 +-
 .../test/cases/adapters/mysql2/datetime_test.rb    |   87 +
 .../test/cases/adapters/mysql2/explain_test.rb     |    7 +-
 .../cases/adapters/mysql2/reserved_word_test.rb    |    2 +-
 .../adapters/mysql2/schema_migrations_test.rb      |   20 +-
 .../test/cases/adapters/mysql2/schema_test.rb      |   14 +-
 .../cases/adapters/mysql2/unsigned_type_test.rb    |   30 +
 .../adapters/postgresql/active_schema_test.rb      |    2 +-
 .../test/cases/adapters/postgresql/array_test.rb   |  153 +-
 .../cases/adapters/postgresql/bit_string_test.rb   |   78 +
 .../test/cases/adapters/postgresql/bytea_test.rb   |   39 +-
 .../adapters/postgresql/change_schema_test.rb      |   31 +
 .../test/cases/adapters/postgresql/citext_test.rb  |   71 +
 .../cases/adapters/postgresql/composite_test.rb    |  105 +-
 .../cases/adapters/postgresql/connection_test.rb   |   62 +-
 .../adapters/postgresql/custom_domain_test.rb      |   28 -
 .../cases/adapters/postgresql/datatype_test.rb     |  264 +-
 .../test/cases/adapters/postgresql/domain_test.rb  |   47 +
 .../test/cases/adapters/postgresql/enum_test.rb    |   91 +
 .../test/cases/adapters/postgresql/explain_test.rb |   10 +-
 .../postgresql/extension_migration_test.rb         |    2 -
 .../cases/adapters/postgresql/full_text_test.rb    |   26 +
 .../cases/adapters/postgresql/geometric_test.rb    |   72 +
 .../test/cases/adapters/postgresql/hstore_test.rb  |  155 +-
 .../cases/adapters/postgresql/infinity_test.rb     |   28 +-
 .../test/cases/adapters/postgresql/integer_test.rb |   25 +
 .../test/cases/adapters/postgresql/json_test.rb    |  110 +-
 .../test/cases/adapters/postgresql/ltree_test.rb   |   11 +-
 .../test/cases/adapters/postgresql/money_test.rb   |   96 +
 .../test/cases/adapters/postgresql/network_test.rb |   71 +
 .../adapters/postgresql/postgresql_adapter_test.rb |  124 +-
 .../test/cases/adapters/postgresql/quoting_test.rb |   25 +-
 .../test/cases/adapters/postgresql/range_test.rb   |  131 +-
 .../postgresql/schema_authorization_test.rb        |    2 +-
 .../test/cases/adapters/postgresql/schema_test.rb  |   82 +-
 .../cases/adapters/postgresql/sql_types_test.rb    |   18 -
 .../cases/adapters/postgresql/timestamp_test.rb    |   99 +-
 .../cases/adapters/postgresql/type_lookup_test.rb  |   33 +
 .../test/cases/adapters/postgresql/utils_test.rb   |   47 +-
 .../test/cases/adapters/postgresql/uuid_test.rb    |  289 +-
 .../test/cases/adapters/postgresql/view_test.rb    |   76 +-
 .../test/cases/adapters/postgresql/xml_test.rb     |   22 +-
 .../test/cases/adapters/sqlite3/copy_table_test.rb |    1 -
 .../test/cases/adapters/sqlite3/explain_test.rb    |    7 +-
 .../test/cases/adapters/sqlite3/quoting_test.rb    |   25 +-
 .../cases/adapters/sqlite3/sqlite3_adapter_test.rb |  387 +--
 activerecord/test/cases/ar_schema_test.rb          |   76 +-
 .../cases/associations/association_scope_test.rb   |    5 +
 .../associations/belongs_to_associations_test.rb   |   83 +-
 .../test/cases/associations/callbacks_test.rb      |    7 +-
 .../associations/cascaded_eager_loading_test.rb    |    4 +-
 ...cated_counter_cache_on_has_many_through_test.rb |   26 +
 .../associations/eager_load_nested_include_test.rb |    4 +-
 .../associations/eager_singularization_test.rb     |    2 +-
 activerecord/test/cases/associations/eager_test.rb |  157 +-
 .../test/cases/associations/extension_test.rb      |    1 +
 .../has_and_belongs_to_many_associations_test.rb   |   48 +-
 .../associations/has_many_associations_test.rb     |  330 ++-
 .../has_many_through_associations_test.rb          |  102 +-
 .../associations/has_one_associations_test.rb      |   41 +-
 .../has_one_through_associations_test.rb           |    6 +
 .../associations/inverse_associations_test.rb      |    2 +-
 .../test/cases/associations/join_model_test.rb     |   25 +-
 .../nested_through_associations_test.rb            |    3 +-
 .../test/cases/associations/required_test.rb       |   82 +
 activerecord/test/cases/associations_test.rb       |    6 +
 .../test/cases/attribute_decorators_test.rb        |  125 +
 .../test/cases/attribute_methods/read_test.rb      |    1 +
 .../cases/attribute_methods/serialization_test.rb  |   29 -
 activerecord/test/cases/attribute_methods_test.rb  |  156 +-
 activerecord/test/cases/attribute_set_test.rb      |  200 ++
 activerecord/test/cases/attribute_test.rb          |  180 ++
 activerecord/test/cases/attributes_test.rb         |  136 +
 .../test/cases/autosave_association_test.rb        |   77 +-
 activerecord/test/cases/base_test.rb               |  126 +-
 activerecord/test/cases/batches_test.rb            |   15 -
 activerecord/test/cases/binary_test.rb             |    6 +-
 activerecord/test/cases/bind_parameter_test.rb     |   40 +-
 activerecord/test/cases/calculations_test.rb       |   47 +-
 activerecord/test/cases/callbacks_test.rb          |   12 +-
 activerecord/test/cases/column_definition_test.rb  |   62 +-
 activerecord/test/cases/column_test.rb             |  123 -
 .../connection_adapters/abstract_adapter_test.rb   |   62 -
 .../connection_adapters/adapter_leasing_test.rb    |   54 +
 .../connection_adapters/connection_handler_test.rb |  294 --
 .../merge_and_resolve_default_url_config_test.rb   |  293 ++
 .../connection_adapters/mysql_type_lookup_test.rb  |   65 +
 .../cases/connection_adapters/schema_cache_test.rb |    4 +-
 .../cases/connection_adapters/type_lookup_test.rb  |  110 +
 .../test/cases/connection_management_test.rb       |    8 +
 activerecord/test/cases/connection_pool_test.rb    |   32 +-
 .../connection_specification/resolver_test.rb      |    4 +-
 activerecord/test/cases/core_test.rb               |   79 +
 activerecord/test/cases/counter_cache_test.rb      |   42 +-
 activerecord/test/cases/date_time_test.rb          |   18 +
 activerecord/test/cases/defaults_test.rb           |   15 +-
 activerecord/test/cases/dirty_test.rb              |  166 +-
 activerecord/test/cases/disconnected_test.rb       |    2 +-
 activerecord/test/cases/dup_test.rb                |   21 +
 activerecord/test/cases/explain_subscriber_test.rb |    7 +-
 activerecord/test/cases/explain_test.rb            |    8 +-
 activerecord/test/cases/finder_test.rb             |  204 +-
 activerecord/test/cases/fixtures_test.rb           |   78 +-
 activerecord/test/cases/helper.rb                  |   52 +-
 activerecord/test/cases/hot_compatibility_test.rb  |    2 +-
 activerecord/test/cases/inheritance_test.rb        |   16 +-
 activerecord/test/cases/integration_test.rb        |    1 +
 activerecord/test/cases/invalid_connection_test.rb |    2 +-
 .../test/cases/invertible_migration_test.rb        |    7 +-
 activerecord/test/cases/locking_test.rb            |   44 +-
 .../test/cases/migration/change_schema_test.rb     |  105 +-
 .../test/cases/migration/change_table_test.rb      |   30 +-
 .../test/cases/migration/column_attributes_test.rb |  162 +-
 .../cases/migration/column_positioning_test.rb     |    3 +-
 activerecord/test/cases/migration/columns_test.rb  |   30 +-
 .../test/cases/migration/command_recorder_test.rb  |   51 +-
 .../test/cases/migration/create_join_table_test.rb |   27 +-
 .../test/cases/migration/foreign_key_test.rb       |  250 ++
 activerecord/test/cases/migration/helper.rb        |    6 +-
 activerecord/test/cases/migration/index_test.rb    |  115 +-
 activerecord/test/cases/migration/logger_test.rb   |    5 +-
 .../cases/migration/pending_migrations_test.rb     |   53 +
 .../cases/migration/references_foreign_key_test.rb |  153 ++
 .../test/cases/migration/references_index_test.rb  |    7 +-
 .../cases/migration/references_statements_test.rb  |    7 +-
 .../test/cases/migration/rename_table_test.rb      |   21 +-
 activerecord/test/cases/migration_test.rb          |  125 +-
 activerecord/test/cases/migrator_test.rb           |  570 ++--
 activerecord/test/cases/modules_test.rb            |   31 +-
 .../test/cases/multiparameter_attributes_test.rb   |    4 +-
 activerecord/test/cases/multiple_db_test.rb        |    7 +
 activerecord/test/cases/nested_attributes_test.rb  |   59 +-
 activerecord/test/cases/persistence_test.rb        |   94 +-
 activerecord/test/cases/pooled_connections_test.rb |   34 +-
 activerecord/test/cases/primary_keys_test.rb       |   47 +-
 activerecord/test/cases/query_cache_test.rb        |   32 +
 activerecord/test/cases/quoting_test.rb            |   50 +-
 activerecord/test/cases/readonly_test.rb           |   13 +-
 activerecord/test/cases/reaper_test.rb             |   20 +-
 activerecord/test/cases/reflection_test.rb         |   96 +-
 .../test/cases/relation/delegation_test.rb         |    2 +-
 activerecord/test/cases/relation/merging_test.rb   |   38 +-
 activerecord/test/cases/relation/mutation_test.rb  |   16 +-
 .../test/cases/relation/predicate_builder_test.rb  |    4 +-
 .../test/cases/relation/where_chain_test.rb        |  123 +-
 activerecord/test/cases/relation/where_test.rb     |   65 +
 activerecord/test/cases/relation_test.rb           |   52 +
 activerecord/test/cases/relations_test.rb          |  126 +-
 activerecord/test/cases/reload_models_test.rb      |    2 +-
 activerecord/test/cases/result_test.rb             |   48 +-
 activerecord/test/cases/sanitize_test.rb           |   31 +-
 activerecord/test/cases/schema_dumper_test.rb      |  181 +-
 .../test/cases/scoping/default_scoping_test.rb     |   34 +-
 .../test/cases/scoping/named_scoping_test.rb       |    8 +
 .../test/cases/scoping/relation_scoping_test.rb    |   34 +-
 activerecord/test/cases/serialization_test.rb      |   17 +
 .../test/cases/serialized_attribute_test.rb        |  157 +-
 activerecord/test/cases/statement_cache_test.rb    |   64 +-
 activerecord/test/cases/store_test.rb              |   15 -
 .../test/cases/tasks/database_tasks_test.rb        |   66 +-
 activerecord/test/cases/tasks/mysql_rake_test.rb   |    4 +-
 .../test/cases/tasks/postgresql_rake_test.rb       |    2 +
 activerecord/test/cases/tasks/sqlite_rake_test.rb  |    2 +
 activerecord/test/cases/test_case.rb               |   33 +-
 activerecord/test/cases/timestamp_test.rb          |   43 +
 .../test/cases/transaction_callbacks_test.rb       |   76 +
 activerecord/test/cases/transactions_test.rb       |  151 +-
 activerecord/test/cases/type/decimal_test.rb       |   51 +
 activerecord/test/cases/type/integer_test.rb       |  121 +
 activerecord/test/cases/type/string_test.rb        |   36 +
 activerecord/test/cases/type/type_map_test.rb      |  177 ++
 .../test/cases/type/unsigned_integer_test.rb       |   18 +
 activerecord/test/cases/types_test.rb              |  141 +
 activerecord/test/cases/unconnected_test.rb        |    2 +-
 .../validations/association_validation_test.rb     |   43 +-
 .../test/cases/validations/i18n_validation_test.rb |    3 +-
 .../cases/validations/length_validation_test.rb    |   47 +
 .../cases/validations/presence_validation_test.rb  |    5 +-
 .../validations/uniqueness_validation_test.rb      |   71 +-
 .../test/cases/validations_repair_helper.rb        |    2 +-
 activerecord/test/cases/validations_test.rb        |   61 +-
 activerecord/test/cases/view_test.rb               |  113 +
 activerecord/test/cases/xml_serialization_test.rb  |   18 +-
 activerecord/test/cases/yaml_serialization_test.rb |   52 +-
 activerecord/test/config.example.yml               |   38 +-
 activerecord/test/fixtures/computers.yml           |    5 +
 activerecord/test/fixtures/developers.yml          |    3 +-
 activerecord/test/fixtures/doubloons.yml           |    3 +
 activerecord/test/fixtures/fk_test_has_pk.yml      |    2 +-
 activerecord/test/fixtures/pirates.yml             |    3 +
 activerecord/test/fixtures/posts.yml               |    2 -
 activerecord/test/fixtures/topics.yml              |   10 +-
 activerecord/test/fixtures/uuid_children.yml       |    3 +
 activerecord/test/fixtures/uuid_parents.yml        |    2 +
 activerecord/test/models/author.rb                 |   12 +
 activerecord/test/models/car.rb                    |    2 +-
 activerecord/test/models/comment.rb                |    5 +
 activerecord/test/models/company.rb                |    2 +
 activerecord/test/models/company_in_module.rb      |   18 +
 activerecord/test/models/contact.rb                |    1 +
 activerecord/test/models/developer.rb              |    8 +-
 activerecord/test/models/doubloon.rb               |   12 +
 activerecord/test/models/image.rb                  |    3 +
 activerecord/test/models/member.rb                 |    3 +
 activerecord/test/models/parrot.rb                 |    2 +-
 activerecord/test/models/person.rb                 |    2 +
 activerecord/test/models/personal_legacy_thing.rb  |    4 +
 activerecord/test/models/pirate.rb                 |    7 +-
 activerecord/test/models/post.rb                   |   32 +-
 activerecord/test/models/ship.rb                   |    7 +
 activerecord/test/models/ship_part.rb              |    3 +-
 activerecord/test/models/tagging.rb                |    2 +-
 activerecord/test/models/treasure.rb               |    1 +
 activerecord/test/models/tyre.rb                   |    8 +
 activerecord/test/models/uuid_child.rb             |    3 +
 activerecord/test/models/uuid_parent.rb            |    3 +
 .../test/schema/postgresql_specific_schema.rb      |   30 +-
 activerecord/test/schema/schema.rb                 |   79 +-
 activerecord/test/schema/sqlite_specific_schema.rb |    6 +-
 activerecord/test/support/connection_helper.rb     |   14 +
 activerecord/test/support/ddl_helper.rb            |    8 +
 activerecord/test/support/schema_dumping_helper.rb |   20 +
 activesupport/CHANGELOG.md                         |  888 ++----
 activesupport/README.rdoc                          |    9 +-
 activesupport/Rakefile                             |    2 +-
 activesupport/activesupport.gemspec                |    4 +-
 activesupport/lib/active_support.rb                |   10 +
 .../lib/active_support/backtrace_cleaner.rb        |    8 +-
 activesupport/lib/active_support/cache.rb          |   36 +-
 .../lib/active_support/cache/file_store.rb         |    5 +
 .../active_support/cache/strategy/local_cache.rb   |    9 +-
 .../cache/strategy/local_cache_middleware.rb       |    5 +
 activesupport/lib/active_support/callbacks.rb      |   62 +-
 activesupport/lib/active_support/concern.rb        |   12 +-
 .../lib/active_support/core_ext/array/access.rb    |   10 +-
 .../lib/active_support/core_ext/array/grouping.rb  |    5 +
 .../core_ext/big_decimal/yaml_conversions.rb       |    2 +
 .../core_ext/class/delegating_attributes.rb        |    4 +
 .../active_support/core_ext/date/conversions.rb    |    6 +
 .../core_ext/date_and_time/calculations.rb         |   11 +
 .../core_ext/date_time/calculations.rb             |   14 +-
 .../core_ext/date_time/conversions.rb              |    4 +-
 .../lib/active_support/core_ext/digest/uuid.rb     |   51 +
 .../lib/active_support/core_ext/file/atomic.rb     |    2 +-
 activesupport/lib/active_support/core_ext/hash.rb  |    1 +
 .../lib/active_support/core_ext/hash/compact.rb    |    6 +-
 .../active_support/core_ext/hash/conversions.rb    |    5 +-
 .../lib/active_support/core_ext/hash/except.rb     |   10 +-
 .../core_ext/hash/indifferent_access.rb            |    2 +-
 .../lib/active_support/core_ext/hash/keys.rb       |   16 +-
 .../lib/active_support/core_ext/hash/slice.rb      |   10 +-
 .../core_ext/hash/transform_values.rb              |   23 +
 .../lib/active_support/core_ext/integer/time.rb    |   15 -
 .../lib/active_support/core_ext/kernel.rb          |    5 +-
 .../lib/active_support/core_ext/kernel/concern.rb  |   10 +
 .../lib/active_support/core_ext/kernel/debugger.rb |    2 +-
 .../active_support/core_ext/kernel/reporting.rb    |   15 +
 .../lib/active_support/core_ext/load_error.rb      |    5 +-
 .../lib/active_support/core_ext/module/aliasing.rb |    4 +-
 .../active_support/core_ext/module/delegation.rb   |   44 +-
 .../lib/active_support/core_ext/numeric/time.rb    |   35 +-
 .../lib/active_support/core_ext/object.rb          |    1 +
 .../active_support/core_ext/object/duplicable.rb   |    5 +-
 .../lib/active_support/core_ext/object/itself.rb   |   15 +
 .../lib/active_support/core_ext/object/json.rb     |    4 +-
 .../lib/active_support/core_ext/object/to_json.rb  |    5 -
 .../lib/active_support/core_ext/object/to_query.rb |    3 +-
 .../lib/active_support/core_ext/object/try.rb      |   48 +-
 .../active_support/core_ext/object/with_options.rb |   33 +-
 .../lib/active_support/core_ext/string/access.rb   |    8 +-
 .../lib/active_support/core_ext/string/filters.rb  |   50 +-
 .../active_support/core_ext/string/inflections.rb  |    5 +-
 .../core_ext/string/output_safety.rb               |   47 +-
 .../lib/active_support/core_ext/thread.rb          |    7 +
 .../active_support/core_ext/time/calculations.rb   |   20 +-
 .../active_support/core_ext/time/conversions.rb    |    2 +-
 activesupport/lib/active_support/dependencies.rb   |   50 +-
 .../lib/active_support/dependencies/autoload.rb    |    2 +-
 activesupport/lib/active_support/deprecation.rb    |    2 +-
 .../lib/active_support/deprecation/behaviors.rb    |    2 +-
 activesupport/lib/active_support/duration.rb       |   52 +-
 activesupport/lib/active_support/file_watcher.rb   |   36 -
 activesupport/lib/active_support/gem_version.rb    |    6 +-
 .../active_support/hash_with_indifferent_access.rb |   19 +-
 activesupport/lib/active_support/i18n_railtie.rb   |    8 +-
 .../lib/active_support/inflector/inflections.rb    |    4 +-
 .../lib/active_support/inflector/methods.rb        |   64 +-
 activesupport/lib/active_support/json/decoding.rb  |    2 +-
 activesupport/lib/active_support/json/encoding.rb  |    9 +-
 .../lib/active_support/message_encryptor.rb        |    3 +-
 .../lib/active_support/message_verifier.rb         |   21 +-
 .../lib/active_support/multibyte/chars.rb          |    2 +-
 .../lib/active_support/multibyte/unicode.rb        |    9 +-
 activesupport/lib/active_support/notifications.rb  |   11 +-
 .../lib/active_support/notifications/fanout.rb     |   17 +-
 activesupport/lib/active_support/number_helper.rb  |   25 +-
 .../number_helper/number_to_currency_converter.rb  |    2 +-
 .../number_to_percentage_converter.rb              |    2 +-
 .../number_helper/number_to_rounded_converter.rb   |    4 +-
 activesupport/lib/active_support/security_utils.rb |   20 +
 activesupport/lib/active_support/test_case.rb      |   58 +-
 .../lib/active_support/testing/assertions.rb       |    2 +-
 .../lib/active_support/testing/constant_lookup.rb  |    6 +-
 .../lib/active_support/testing/declarative.rb      |   26 +-
 .../lib/active_support/testing/isolation.rb        |   22 +-
 .../lib/active_support/testing/tagged_logging.rb   |    2 +-
 .../lib/active_support/testing/time_helpers.rb     |   10 +-
 activesupport/lib/active_support/time.rb           |    2 -
 activesupport/lib/active_support/time_with_zone.rb |   33 +-
 .../lib/active_support/values/time_zone.rb         |  152 +-
 .../lib/active_support/values/unicode_tables.dat   |  Bin 904640 -> 1001806 bytes
 activesupport/lib/active_support/xml_mini.rb       |    3 +
 activesupport/lib/active_support/xml_mini/jdom.rb  |   11 +-
 activesupport/lib/active_support/xml_mini/rexml.rb |   11 +-
 activesupport/test/abstract_unit.rb                |    7 +
 activesupport/test/autoload_test.rb                |   23 +-
 activesupport/test/autoloading_fixtures/typo.rb    |    2 +
 activesupport/test/caching_test.rb                 |   79 +-
 activesupport/test/clean_backtrace_test.rb         |    5 +
 activesupport/test/concern_test.rb                 |   35 +-
 activesupport/test/constantize_test_cases.rb       |   41 +
 activesupport/test/core_ext/array/access_test.rb   |   30 +
 .../test/core_ext/array/conversions_test.rb        |  197 ++
 .../test/core_ext/array/extract_options_test.rb    |   45 +
 activesupport/test/core_ext/array/grouping_test.rb |  126 +
 .../test/core_ext/array/prepend_append_test.rb     |   12 +
 activesupport/test/core_ext/array/wrap_test.rb     |   77 +
 activesupport/test/core_ext/array_ext_test.rb      |  451 ----
 .../core_ext/class/delegating_attributes_test.rb   |   34 +-
 activesupport/test/core_ext/date_ext_test.rb       |   18 +-
 activesupport/test/core_ext/date_time_ext_test.rb  |   24 +-
 activesupport/test/core_ext/digest/uuid_test.rb    |   24 +
 activesupport/test/core_ext/duplicable_test.rb     |   38 -
 activesupport/test/core_ext/duration_test.rb       |   56 +-
 .../test/core_ext/hash/transform_keys_test.rb      |   32 +
 .../test/core_ext/hash/transform_values_test.rb    |   61 +
 activesupport/test/core_ext/hash_ext_test.rb       |   64 +-
 activesupport/test/core_ext/kernel/concern_test.rb |   13 +
 activesupport/test/core_ext/kernel_test.rb         |   38 +-
 activesupport/test/core_ext/load_error_test.rb     |   11 +-
 .../test/core_ext/module/concerning_test.rb        |   58 +-
 activesupport/test/core_ext/module_test.rb         |   11 +
 activesupport/test/core_ext/numeric_ext_test.rb    |   52 +-
 .../test/core_ext/object/acts_like_test.rb         |   33 +
 .../test/core_ext/{ => object}/blank_test.rb       |    0
 .../test/core_ext/{ => object}/deep_dup_test.rb    |    0
 .../test/core_ext/object/duplicable_test.rb        |   31 +
 .../test/core_ext/object/inclusion_test.rb         |    4 +
 .../core_ext/object/instance_variables_test.rb     |   31 +
 activesupport/test/core_ext/object/itself_test.rb  |    9 +
 activesupport/test/core_ext/object/json_test.rb    |    9 -
 .../test/core_ext/object/to_param_test.rb          |   10 +-
 .../test/core_ext/object/to_query_test.rb          |    4 +
 activesupport/test/core_ext/object/try_test.rb     |   99 +
 .../test/core_ext/object_and_class_ext_test.rb     |  156 --
 activesupport/test/core_ext/range_ext_test.rb      |    9 +-
 activesupport/test/core_ext/string_ext_test.rb     |  124 +-
 activesupport/test/core_ext/time_ext_test.rb       |   30 +-
 activesupport/test/core_ext/time_with_zone_test.rb |   83 +-
 activesupport/test/core_ext/uri_ext_test.rb        |    2 +-
 activesupport/test/dependencies_test.rb            |  287 +-
 activesupport/test/dependencies_test_helpers.rb    |    1 +
 activesupport/test/deprecation_test.rb             |   17 +
 .../test/hash_with_indifferent_access_test.rb      |   10 +
 activesupport/test/i18n_test.rb                    |    1 -
 activesupport/test/inflector_test.rb               |   32 +-
 activesupport/test/inflector_test_cases.rb         |   11 +-
 activesupport/test/json/decoding_test.rb           |   30 +-
 activesupport/test/json/encoding_test.rb           |   93 +-
 activesupport/test/key_generator_test.rb           |   30 +
 activesupport/test/message_verifier_test.rb        |    7 +
 activesupport/test/multibyte_chars_test.rb         |   27 +-
 activesupport/test/multibyte_conformance.rb        |  129 -
 activesupport/test/multibyte_conformance_test.rb   |  133 +
 activesupport/test/multibyte_proxy_test.rb         |   34 +
 activesupport/test/multibyte_test_helpers.rb       |    6 +-
 activesupport/test/number_helper_i18n_test.rb      |   16 +-
 activesupport/test/number_helper_test.rb           |    4 +
 activesupport/test/option_merger_test.rb           |    9 +
 activesupport/test/security_utils_test.rb          |    9 +
 activesupport/test/subscriber_test.rb              |    2 +-
 activesupport/test/test_case_test.rb               |  221 ++
 activesupport/test/test_test.rb                    |  220 --
 activesupport/test/testing/constant_lookup_test.rb |    8 +
 activesupport/test/time_travel_test.rb             |   72 +
 activesupport/test/time_zone_test.rb               |   22 +-
 activesupport/test/time_zone_test_helpers.rb       |   16 +
 activesupport/test/transliterate_test.rb           |    2 +-
 activesupport/test/xml_mini_test.rb                |   59 +-
 ci/travis.rb                                       |   19 +-
 guides/CHANGELOG.md                                |   70 +-
 guides/Rakefile                                    |    8 +-
 .../getting_started/article_with_comments.png      |  Bin 15190 -> 22560 bytes
 guides/assets/javascripts/guides.js                |    6 +
 guides/assets/stylesheets/main.css                 |    5 +-
 .../bug_report_templates/action_controller_gem.rb  |    2 +-
 .../action_controller_master.rb                    |    1 +
 guides/bug_report_templates/active_record_gem.rb   |    2 +-
 guides/bug_report_templates/generic_gem.rb         |   15 +
 guides/bug_report_templates/generic_master.rb      |   26 +
 guides/code/getting_started/.gitignore             |   16 -
 guides/code/getting_started/Gemfile                |   40 -
 guides/code/getting_started/Gemfile.lock           |  125 -
 guides/code/getting_started/README.rdoc            |   28 -
 guides/code/getting_started/Rakefile               |    6 -
 .../app/assets/javascripts/application.js          |   15 -
 .../app/assets/javascripts/comments.js.coffee      |    3 -
 .../app/assets/javascripts/posts.js.coffee         |    3 -
 .../app/assets/javascripts/welcome.js.coffee       |    3 -
 .../app/assets/stylesheets/application.css         |   13 -
 .../app/assets/stylesheets/comments.css.scss       |    3 -
 .../app/assets/stylesheets/posts.css.scss          |    3 -
 .../app/assets/stylesheets/welcome.css.scss        |    3 -
 .../app/controllers/application_controller.rb      |    5 -
 .../app/controllers/comments_controller.rb         |   23 -
 .../getting_started/app/controllers/concerns/.keep |    0
 .../app/controllers/posts_controller.rb            |   53 -
 .../app/controllers/welcome_controller.rb          |    4 -
 .../app/helpers/application_helper.rb              |    2 -
 .../getting_started/app/helpers/comments_helper.rb |    2 -
 .../getting_started/app/helpers/posts_helper.rb    |    2 -
 .../getting_started/app/helpers/welcome_helper.rb  |    2 -
 guides/code/getting_started/app/mailers/.keep      |    0
 guides/code/getting_started/app/models/.keep       |    0
 guides/code/getting_started/app/models/comment.rb  |    3 -
 .../code/getting_started/app/models/concerns/.keep |    0
 guides/code/getting_started/app/models/post.rb     |    7 -
 .../app/views/comments/_comment.html.erb           |   15 -
 .../app/views/comments/_form.html.erb              |   13 -
 .../app/views/layouts/application.html.erb         |   14 -
 .../getting_started/app/views/posts/_form.html.erb |   27 -
 .../getting_started/app/views/posts/edit.html.erb  |    5 -
 .../getting_started/app/views/posts/index.html.erb |   21 -
 .../getting_started/app/views/posts/new.html.erb   |    5 -
 .../getting_started/app/views/posts/show.html.erb  |   18 -
 .../app/views/welcome/index.html.erb               |    4 -
 guides/code/getting_started/bin/bundle             |    4 -
 guides/code/getting_started/bin/rails              |    4 -
 guides/code/getting_started/bin/rake               |    4 -
 guides/code/getting_started/config.ru              |    4 -
 guides/code/getting_started/config/application.rb  |   18 -
 guides/code/getting_started/config/boot.rb         |    4 -
 guides/code/getting_started/config/database.yml    |   25 -
 guides/code/getting_started/config/environment.rb  |    5 -
 .../config/environments/development.rb             |   30 -
 .../config/environments/production.rb              |   80 -
 .../getting_started/config/environments/test.rb    |   36 -
 .../config/initializers/backtrace_silencers.rb     |    7 -
 .../initializers/filter_parameter_logging.rb       |    4 -
 .../config/initializers/inflections.rb             |   16 -
 .../getting_started/config/initializers/locale.rb  |    9 -
 .../config/initializers/mime_types.rb              |    5 -
 .../config/initializers/secret_token.rb            |   12 -
 .../config/initializers/session_store.rb           |    3 -
 .../config/initializers/wrap_parameters.rb         |   14 -
 guides/code/getting_started/config/locales/en.yml  |   23 -
 guides/code/getting_started/config/routes.rb       |    7 -
 .../db/migrate/20130122042648_create_posts.rb      |   10 -
 .../db/migrate/20130122045842_create_comments.rb   |   11 -
 guides/code/getting_started/db/schema.rb           |   33 -
 guides/code/getting_started/db/seeds.rb            |    7 -
 guides/code/getting_started/lib/assets/.keep       |    0
 guides/code/getting_started/lib/tasks/.keep        |    0
 guides/code/getting_started/log/.keep              |    0
 guides/code/getting_started/public/404.html        |   60 -
 guides/code/getting_started/public/422.html        |   60 -
 guides/code/getting_started/public/500.html        |   59 -
 guides/code/getting_started/public/favicon.ico     |    0
 guides/code/getting_started/public/robots.txt      |    5 -
 guides/code/getting_started/test/controllers/.keep |    0
 .../test/controllers/comments_controller_test.rb   |    7 -
 .../test/controllers/posts_controller_test.rb      |    7 -
 .../test/controllers/welcome_controller_test.rb    |    9 -
 guides/code/getting_started/test/fixtures/.keep    |    0
 .../getting_started/test/fixtures/comments.yml     |   11 -
 .../code/getting_started/test/fixtures/posts.yml   |    9 -
 guides/code/getting_started/test/helpers/.keep     |    0
 .../test/helpers/comments_helper_test.rb           |    4 -
 .../test/helpers/posts_helper_test.rb              |    4 -
 .../test/helpers/welcome_helper_test.rb            |    4 -
 guides/code/getting_started/test/integration/.keep |    0
 guides/code/getting_started/test/mailers/.keep     |    0
 guides/code/getting_started/test/models/.keep      |    0
 .../getting_started/test/models/comment_test.rb    |    7 -
 .../code/getting_started/test/models/post_test.rb  |    7 -
 guides/code/getting_started/test/test_helper.rb    |   12 -
 .../vendor/assets/javascripts/.keep                |    0
 .../vendor/assets/stylesheets/.keep                |    0
 guides/rails_guides.rb                             |    4 +-
 guides/rails_guides/helpers.rb                     |    2 +-
 guides/rails_guides/levenshtein.rb                 |   48 +-
 guides/rails_guides/markdown.rb                    |   18 +-
 guides/rails_guides/markdown/renderer.rb           |    2 +-
 guides/source/2_2_release_notes.md                 |    2 +-
 guides/source/2_3_release_notes.md                 |    8 +-
 guides/source/3_0_release_notes.md                 |   16 +-
 guides/source/3_1_release_notes.md                 |    7 +-
 guides/source/3_2_release_notes.md                 |    9 +-
 guides/source/4_0_release_notes.md                 |    9 +-
 guides/source/4_1_release_notes.md                 |   11 +-
 guides/source/4_2_release_notes.md                 |  877 ++++++
 guides/source/_license.html.erb                    |    2 +-
 guides/source/_welcome.html.erb                    |   10 +-
 guides/source/action_controller_overview.md        |   33 +-
 guides/source/action_mailer_basics.md              |  126 +-
 guides/source/action_view_overview.md              |  325 +--
 guides/source/active_job_basics.md                 |  318 +++
 guides/source/active_model_basics.md               |  388 ++-
 guides/source/active_record_basics.md              |   47 +-
 guides/source/active_record_callbacks.md           |   21 +-
 guides/source/active_record_migrations.md          | 1018 +++++++
 guides/source/active_record_postgresql.md          |  433 +++
 guides/source/active_record_querying.md            |  530 ++--
 guides/source/active_record_validations.md         |   31 +-
 guides/source/active_support_core_extensions.md    |  231 +-
 guides/source/active_support_instrumentation.md    |   17 +-
 guides/source/api_documentation_guidelines.md      |   78 +-
 guides/source/asset_pipeline.md                    |  367 ++-
 guides/source/association_basics.md                |  176 +-
 .../source/autoloading_and_reloading_constants.md  | 1311 +++++++++
 guides/source/caching_with_rails.md                |   39 +-
 guides/source/command_line.md                      |   82 +-
 guides/source/configuring.md                       |  163 +-
 guides/source/contributing_to_ruby_on_rails.md     |  308 ++-
 guides/source/credits.html.erb                     |    4 +-
 guides/source/debugging_rails_applications.md      |  726 +++--
 guides/source/development_dependencies_install.md  |   83 +-
 guides/source/documents.yaml                       |   26 +-
 guides/source/engines.md                           |  378 +--
 guides/source/form_helpers.md                      |  135 +-
 guides/source/generators.md                        |   35 +-
 guides/source/getting_started.md                   |  571 ++--
 guides/source/i18n.md                              |  176 +-
 guides/source/index.html.erb                       |    1 +
 guides/source/initialization.md                    |  171 +-
 guides/source/layout.html.erb                      |    5 +-
 guides/source/layouts_and_rendering.md             |   35 +-
 guides/source/maintenance_policy.md                |    9 +-
 guides/source/migrations.md                        | 1143 --------
 guides/source/nested_model_forms.md                |   11 +-
 guides/source/plugins.md                           |   54 +-
 guides/source/rails_application_templates.md       |   24 +-
 guides/source/rails_on_rack.md                     |   12 +-
 guides/source/routing.md                           |  182 +-
 guides/source/ruby_on_rails_guides_guidelines.md   |   23 +-
 guides/source/security.md                          |   70 +-
 guides/source/testing.md                           |  316 ++-
 guides/source/upgrading_ruby_on_rails.md           |  314 ++-
 guides/source/working_with_javascript_in_rails.md  |   34 +-
 guides/w3c_validator.rb                            |    2 +
 install.rb                                         |    2 +-
 rails.gemspec                                      |    3 +-
 railties/CHANGELOG.md                              |  473 ++--
 railties/RDOC_MAIN.rdoc                            |    2 +-
 railties/README.rdoc                               |    8 +-
 railties/Rakefile                                  |    1 +
 railties/lib/rails.rb                              |    8 +-
 railties/lib/rails/all.rb                          |    1 +
 railties/lib/rails/api/task.rb                     |    7 +
 railties/lib/rails/app_rails_loader.rb             |    8 +-
 railties/lib/rails/application.rb                  |   84 +-
 railties/lib/rails/application/bootstrap.rb        |   16 +-
 railties/lib/rails/application/configuration.rb    |   69 +-
 .../rails/application/default_middleware_stack.rb  |    8 +-
 railties/lib/rails/application/finisher.rb         |    2 -
 railties/lib/rails/backtrace_cleaner.rb            |   13 +-
 railties/lib/rails/code_statistics.rb              |    7 +-
 railties/lib/rails/commands/commands_tasks.rb      |    9 +-
 railties/lib/rails/commands/console.rb             |   36 +-
 railties/lib/rails/commands/dbconsole.rb           |   21 +-
 railties/lib/rails/commands/destroy.rb             |    2 +
 railties/lib/rails/commands/generate.rb            |    2 +
 railties/lib/rails/commands/plugin.rb              |    2 +-
 railties/lib/rails/commands/server.rb              |   47 +-
 railties/lib/rails/commands/update.rb              |    9 -
 railties/lib/rails/configuration.rb                |    4 +-
 railties/lib/rails/engine.rb                       |   19 +-
 railties/lib/rails/gem_version.rb                  |    4 +-
 railties/lib/rails/generators.rb                   |   81 +-
 railties/lib/rails/generators/actions.rb           |   36 +-
 .../rails/generators/actions/create_migration.rb   |    7 +-
 railties/lib/rails/generators/app_base.rb          |   84 +-
 railties/lib/rails/generators/base.rb              |    4 +-
 .../generators/erb/mailer/mailer_generator.rb      |   27 +-
 .../erb/mailer/templates/layout.html.erb           |    5 +
 .../erb/mailer/templates/layout.text.erb           |    1 +
 .../erb/scaffold/templates/_form.html.erb          |    5 -
 .../erb/scaffold/templates/edit.html.erb           |    2 +-
 .../erb/scaffold/templates/index.html.erb          |    4 +-
 .../generators/erb/scaffold/templates/new.html.erb |    2 +-
 .../lib/rails/generators/generated_attribute.rb    |   32 +-
 railties/lib/rails/generators/model_helpers.rb     |   28 +
 .../rails/generators/rails/app/app_generator.rb    |    8 +-
 .../rails/generators/rails/app/templates/Gemfile   |   27 +-
 .../app/assets/javascripts/application.js.tt       |    2 +-
 .../app/assets/stylesheets/application.css         |    2 +-
 .../rails/generators/rails/app/templates/bin/rails |    2 +-
 .../rails/generators/rails/app/templates/bin/setup |   28 +
 .../rails/generators/rails/app/templates/config.ru |    2 +-
 .../rails/app/templates/config/application.rb      |    8 +-
 .../generators/rails/app/templates/config/boot.rb  |    3 +-
 .../app/templates/config/databases/ibm_db.yml      |    4 +-
 .../app/templates/config/databases/oracle.yml      |    2 +-
 .../config/environments/development.rb.tt          |    4 +
 .../templates/config/environments/production.rb.tt |   25 +-
 .../app/templates/config/environments/test.rb.tt   |    7 +-
 .../app/templates/config/initializers/assets.rb.tt |    3 +
 .../config/initializers/cookies_serializer.rb      |    2 +-
 .../rails/generators/rails/app/templates/gitignore |    5 +-
 .../lib/rails/generators/rails/controller/USAGE    |    1 -
 .../rails/controller/controller_generator.rb       |    8 +-
 railties/lib/rails/generators/rails/helper/USAGE   |    4 -
 railties/lib/rails/generators/rails/model/USAGE    |   15 +-
 .../generators/rails/model/model_generator.rb      |    4 +
 .../generators/rails/plugin/plugin_generator.rb    |   22 +
 .../rails/plugin/templates/%name%.gemspec          |    4 +-
 .../generators/rails/plugin/templates/Gemfile      |   20 +-
 .../generators/rails/plugin/templates/MIT-LICENSE  |    2 +-
 .../generators/rails/plugin/templates/Rakefile     |    4 +
 .../rails/plugin/templates/rails/application.rb    |    2 +-
 .../rails/plugin/templates/rails/javascripts.js    |    2 +-
 .../rails/plugin/templates/rails/stylesheets.css   |    2 +-
 .../rails/plugin/templates/test/test_helper.rb     |    3 +-
 railties/lib/rails/generators/rails/scaffold/USAGE |    8 +-
 railties/lib/rails/generators/resource_helpers.rb  |   13 +-
 .../controller/templates/functional_test.rb        |    6 +
 .../test_unit/helper/helper_generator.rb           |    6 +-
 .../test_unit/helper/templates/helper_test.rb      |    6 -
 .../generators/test_unit/job/job_generator.rb      |   13 +
 .../test_unit/job/templates/unit_test.rb.erb       |    9 +
 .../test_unit/scaffold/scaffold_generator.rb       |    9 +
 .../scaffold/templates/functional_test.rb          |    5 +-
 .../lib/rails/generators/testing/assertions.rb     |    2 +-
 railties/lib/rails/generators/testing/behaviour.rb |   19 +-
 railties/lib/rails/info.rb                         |   32 +-
 railties/lib/rails/info_controller.rb              |    2 +-
 railties/lib/rails/mailers_controller.rb           |   30 +-
 railties/lib/rails/paths.rb                        |    6 +-
 railties/lib/rails/rack.rb                         |    2 +-
 railties/lib/rails/rack/log_tailer.rb              |    4 +
 railties/lib/rails/rack/logger.rb                  |    2 +-
 railties/lib/rails/railtie.rb                      |    6 +-
 railties/lib/rails/ruby_version_check.rb           |    2 +-
 railties/lib/rails/rubyprof_ext.rb                 |   35 -
 railties/lib/rails/source_annotation_extractor.rb  |   44 +-
 railties/lib/rails/tasks/framework.rake            |    2 +-
 railties/lib/rails/tasks/statistics.rake           |   11 +-
 .../rails/templates/rails/mailers/email.html.erb   |   26 +-
 .../rails/templates/rails/mailers/index.html.erb   |    4 +-
 .../rails/templates/rails/mailers/mailer.html.erb  |    2 +-
 .../rails/templates/rails/welcome/index.html.erb   |   30 +-
 railties/lib/rails/test_unit/sub_test_task.rb      |    4 +-
 railties/lib/rails/test_unit/testing.rake          |   28 +-
 railties/test/abstract_unit.rb                     |   25 +
 railties/test/app_rails_loader_test.rb             |   31 +-
 railties/test/application/asset_debugging_test.rb  |    4 +-
 railties/test/application/assets_test.rb           |   49 +-
 railties/test/application/bin_setup_test.rb        |   54 +
 .../test/application/configuration/base_test.rb    |   37 +
 .../test/application/configuration/custom_test.rb  |   22 +
 railties/test/application/configuration_test.rb    |  355 ++-
 .../application/initializers/frameworks_test.rb    |    8 +-
 .../test/application/initializers/i18n_test.rb     |   44 +-
 railties/test/application/mailer_previews_test.rb  |  316 +++
 .../test/application/middleware/exceptions_test.rb |   15 +
 .../test/application/middleware/remote_ip_test.rb  |   16 +-
 .../test/application/middleware/sendfile_test.rb   |    2 +-
 railties/test/application/middleware_test.rb       |   19 +-
 .../test/application/multiple_applications_test.rb |   62 +-
 railties/test/application/rack/logger_test.rb      |    8 +-
 railties/test/application/rake/dbs_test.rb         |  103 +-
 railties/test/application/rake/migrations_test.rb  |   17 +-
 railties/test/application/rake/notes_test.rb       |  125 +-
 railties/test/application/rake_test.rb             |   11 +
 railties/test/application/routing_test.rb          |   20 +
 railties/test/application/test_runner_test.rb      |   17 +-
 railties/test/code_statistics_test.rb              |   20 +
 railties/test/commands/console_test.rb             |   88 +-
 railties/test/commands/dbconsole_test.rb           |  115 +-
 .../configuration/middleware_stack_proxy_test.rb   |    1 +
 railties/test/engine_test.rb                       |   11 +
 railties/test/generators/actions_test.rb           |   35 +-
 railties/test/generators/app_generator_test.rb     |  132 +-
 railties/test/generators/argv_scrubber_test.rb     |    2 +-
 .../test/generators/controller_generator_test.rb   |    9 +-
 .../test/generators/generated_attribute_test.rb    |    8 +
 railties/test/generators/generators_test_helper.rb |   10 +-
 railties/test/generators/helper_generator_test.rb  |   15 -
 railties/test/generators/mailer_generator_test.rb  |   39 +-
 .../test/generators/migration_generator_test.rb    |   90 +-
 railties/test/generators/model_generator_test.rb   |   84 +-
 railties/test/generators/named_base_test.rb        |    1 +
 .../test/generators/namespaced_generators_test.rb  |   11 +-
 railties/test/generators/plugin_generator_test.rb  |   56 +-
 .../test/generators/resource_generator_test.rb     |    7 +-
 .../scaffold_controller_generator_test.rb          |   21 +-
 .../test/generators/scaffold_generator_test.rb     |   18 +-
 railties/test/generators/shared_generator_tests.rb |   16 +-
 railties/test/generators_test.rb                   |   23 +-
 railties/test/isolation/abstract_unit.rb           |   55 +-
 railties/test/path_generation_test.rb              |   88 +
 railties/test/paths_test.rb                        |    1 +
 railties/test/rack_logger_test.rb                  |    4 +-
 railties/test/rails_info_controller_test.rb        |    1 +
 railties/test/rails_info_test.rb                   |   23 +-
 railties/test/railties/engine_test.rb              |   19 +-
 railties/test/railties/generators_test.rb          |    8 +
 railties/test/railties/mounted_engine_test.rb      |   10 +-
 railties/test/railties/railtie_test.rb             |    2 +-
 tasks/release.rb                                   |    4 +-
 tools/README.md                                    |    7 +
 tools/line_statistics                              |   42 +
 tools/profile                                      |  165 +-
 version.rb                                         |    4 +-
 1469 files changed, 46679 insertions(+), 30042 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