[DRE-commits] [rails] 38/44: Merge tag 'upstream/4.1.4'

Ondrej Sury ondrej at moszumanska.debian.org
Wed Jul 16 15:04:05 UTC 2014


This is an automated email from the git hooks/post-receive script.

ondrej pushed a commit to branch master
in repository rails.

commit e89abd9338af091f65ca4de196a6c6a8e34ba570
Merge: 1f94e62 f0ee24c
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Jul 16 15:03:47 2014 +0200

    Merge tag 'upstream/4.1.4'
    
    Upstream version 4.1.4
    
    # gpg: Signature made 2014-07-16T15:03:46 CEST 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]"

 .travis.yml                                        |   19 +-
 CONTRIBUTING.md                                    |    2 +
 Gemfile                                            |   48 +-
 RAILS_VERSION                                      |    2 +-
 README.md                                          |   39 +-
 RELEASING_RAILS.rdoc                               |   35 +-
 Rakefile                                           |   39 +-
 actionmailer/CHANGELOG.md                          |   99 +-
 actionmailer/MIT-LICENSE                           |    2 +-
 actionmailer/README.rdoc                           |    8 +-
 actionmailer/Rakefile                              |    6 +-
 actionmailer/actionmailer.gemspec                  |    1 +
 actionmailer/lib/action_mailer.rb                  |    5 +-
 actionmailer/lib/action_mailer/base.rb             |  230 +-
 actionmailer/lib/action_mailer/delivery_methods.rb |    1 +
 actionmailer/lib/action_mailer/gem_version.rb      |   15 +
 actionmailer/lib/action_mailer/log_subscriber.rb   |   14 +
 actionmailer/lib/action_mailer/mail_helper.rb      |    8 +-
 actionmailer/lib/action_mailer/preview.rb          |  104 +
 actionmailer/lib/action_mailer/railtie.rb          |   10 +
 actionmailer/lib/action_mailer/version.rb          |   11 +-
 actionmailer/test/abstract_unit.rb                 |   20 +-
 actionmailer/test/base_test.rb                     |   81 +-
 actionmailer/test/delivery_methods_test.rb         |   29 +-
 .../base_mailer/email_with_translations.html.erb   |    2 +-
 .../test_mailer/included_subtemplate.text.erb      |    2 +-
 actionmailer/test/i18n_with_controller_test.rb     |    1 +
 actionmailer/test/log_subscriber_test.rb           |    9 +-
 actionmailer/test/mailers/base_mailer.rb           |    2 +-
 actionpack/CHANGELOG.md                            | 1565 ++------
 actionpack/MIT-LICENSE                             |    2 +-
 actionpack/README.rdoc                             |    7 +-
 actionpack/RUNNING_UNIT_TESTS.rdoc                 |   16 +-
 actionpack/Rakefile                                |   27 +-
 actionpack/actionpack.gemspec                      |    9 +-
 actionpack/lib/abstract_controller.rb              |    3 +-
 actionpack/lib/abstract_controller/base.rb         |   28 +-
 actionpack/lib/abstract_controller/callbacks.rb    |    6 +-
 actionpack/lib/abstract_controller/collector.rb    |   12 +-
 actionpack/lib/abstract_controller/helpers.rb      |   33 +-
 actionpack/lib/abstract_controller/layouts.rb      |  423 ---
 actionpack/lib/abstract_controller/rendering.rb    |  178 +-
 actionpack/lib/abstract_controller/view_paths.rb   |   96 -
 actionpack/lib/action_controller.rb                |   18 +-
 actionpack/lib/action_controller/base.rb           |   24 +-
 actionpack/lib/action_controller/caching.rb        |   12 +-
 actionpack/lib/action_controller/deprecated.rb     |    7 -
 .../deprecated/integration_test.rb                 |    5 -
 actionpack/lib/action_controller/log_subscriber.rb |   11 +-
 actionpack/lib/action_controller/metal.rb          |    7 +-
 .../lib/action_controller/metal/data_streaming.rb  |    2 +-
 actionpack/lib/action_controller/metal/flash.rb    |   17 +
 .../lib/action_controller/metal/force_ssl.rb       |    2 +-
 actionpack/lib/action_controller/metal/head.rb     |    6 +-
 actionpack/lib/action_controller/metal/helpers.rb  |    8 +-
 .../action_controller/metal/http_authentication.rb |   30 +-
 .../lib/action_controller/metal/instrumentation.rb |    2 +-
 actionpack/lib/action_controller/metal/live.rb     |  132 +-
 .../lib/action_controller/metal/mime_responds.rb   |  146 +-
 .../lib/action_controller/metal/params_wrapper.rb  |   15 +-
 .../lib/action_controller/metal/rack_delegation.rb |    2 +-
 .../lib/action_controller/metal/redirecting.rb     |   41 +-
 .../lib/action_controller/metal/renderers.rb       |    8 +-
 .../lib/action_controller/metal/rendering.rb       |   59 +-
 .../metal/request_forgery_protection.rb            |   83 +-
 .../lib/action_controller/metal/responder.rb       |   16 +-
 .../lib/action_controller/metal/streaming.rb       |   38 +-
 .../action_controller/metal/strong_parameters.rb   |   46 +-
 actionpack/lib/action_controller/metal/testing.rb  |    1 -
 actionpack/lib/action_controller/railtie.rb        |    2 +-
 .../lib/action_controller/record_identifier.rb     |   31 -
 actionpack/lib/action_controller/test_case.rb      |   60 +-
 .../lib/action_controller/vendor/html-scanner.rb   |    5 -
 actionpack/lib/action_dispatch.rb                  |   13 +-
 .../lib/action_dispatch/http/filter_redirect.rb    |    9 +-
 actionpack/lib/action_dispatch/http/headers.rb     |    4 +-
 .../lib/action_dispatch/http/mime_negotiation.rb   |   20 +-
 actionpack/lib/action_dispatch/http/mime_type.rb   |   29 +-
 actionpack/lib/action_dispatch/http/mime_types.rb  |    1 +
 actionpack/lib/action_dispatch/http/parameters.rb  |   37 +-
 actionpack/lib/action_dispatch/http/request.rb     |   41 +-
 actionpack/lib/action_dispatch/http/response.rb    |   71 +-
 actionpack/lib/action_dispatch/http/upload.rb      |   13 -
 actionpack/lib/action_dispatch/http/url.rb         |   28 +-
 .../lib/action_dispatch/journey/formatter.rb       |    6 +-
 .../journey/gtg/transition_table.rb                |    8 +-
 actionpack/lib/action_dispatch/journey/parser.rb   |    2 +-
 actionpack/lib/action_dispatch/journey/parser.y    |    1 +
 actionpack/lib/action_dispatch/journey/route.rb    |    4 +
 .../lib/action_dispatch/journey/router/utils.rb    |   68 +-
 actionpack/lib/action_dispatch/journey/visitors.rb |   88 +-
 .../lib/action_dispatch/middleware/callbacks.rb    |   12 +-
 .../lib/action_dispatch/middleware/cookies.rb      |  144 +-
 .../action_dispatch/middleware/debug_exceptions.rb |   34 +-
 .../middleware/exception_wrapper.rb                |   12 +-
 actionpack/lib/action_dispatch/middleware/flash.rb |   41 +-
 .../action_dispatch/middleware/params_parser.rb    |    2 +-
 .../lib/action_dispatch/middleware/reloader.rb     |   13 +-
 .../lib/action_dispatch/middleware/remote_ip.rb    |    4 +-
 .../middleware/session/cookie_store.rb             |   11 +-
 .../action_dispatch/middleware/show_exceptions.rb  |    7 +-
 actionpack/lib/action_dispatch/middleware/ssl.rb   |   15 +-
 .../lib/action_dispatch/middleware/static.rb       |    6 +-
 ...response.erb => _request_and_response.html.erb} |    0
 .../rescues/_request_and_response.text.erb         |   23 +
 .../rescues/{_trace.erb => _trace.html.erb}        |    0
 .../middleware/templates/rescues/_trace.text.erb   |   15 +
 .../middleware/templates/rescues/diagnostics.erb   |    2 +-
 .../templates/rescues/missing_template.erb         |    7 -
 .../templates/rescues/missing_template.html.erb    |    7 +
 .../templates/rescues/missing_template.text.erb    |    3 +
 .../middleware/templates/rescues/routing_error.erb |   30 -
 .../templates/rescues/routing_error.html.erb       |   30 +
 .../templates/rescues/routing_error.text.erb       |   11 +
 .../templates/rescues/template_error.erb           |   43 -
 .../templates/rescues/template_error.html.erb      |   43 +
 .../templates/rescues/template_error.text.erb      |    8 +
 .../templates/rescues/unknown_action.erb           |    6 -
 .../templates/rescues/unknown_action.html.erb      |    6 +
 .../templates/rescues/unknown_action.text.erb      |    3 +
 .../middleware/templates/routes/_table.html.erb    |    6 +-
 actionpack/lib/action_dispatch/railtie.rb          |    5 +-
 actionpack/lib/action_dispatch/request/session.rb  |   12 +
 actionpack/lib/action_dispatch/request/utils.rb    |   35 +
 actionpack/lib/action_dispatch/routing.rb          |   13 +-
 .../lib/action_dispatch/routing/inspector.rb       |   11 +-
 actionpack/lib/action_dispatch/routing/mapper.rb   |  244 +-
 .../action_dispatch/routing/polymorphic_routes.rb  |   13 +
 .../lib/action_dispatch/routing/redirection.rb     |   61 +-
 .../lib/action_dispatch/routing/route_set.rb       |   86 +-
 actionpack/lib/action_dispatch/routing/url_for.rb  |    4 +-
 .../action_dispatch/testing/assertions/response.rb |   29 +-
 .../action_dispatch/testing/assertions/routing.rb  |    2 +-
 .../action_dispatch/testing/assertions/selector.rb |    8 +-
 .../lib/action_dispatch/testing/integration.rb     |   12 +-
 actionpack/lib/action_pack.rb                      |    2 +-
 actionpack/lib/action_pack/gem_version.rb          |   15 +
 actionpack/lib/action_pack/version.rb              |   11 +-
 actionpack/lib/action_view.rb                      |   93 -
 actionpack/lib/action_view/base.rb                 |  201 -
 actionpack/lib/action_view/dependency_tracker.rb   |   93 -
 actionpack/lib/action_view/digestor.rb             |  113 -
 actionpack/lib/action_view/flows.rb                |   76 -
 actionpack/lib/action_view/helpers.rb              |   58 -
 .../lib/action_view/helpers/active_model_helper.rb |   49 -
 .../lib/action_view/helpers/asset_tag_helper.rb    |  320 --
 .../lib/action_view/helpers/asset_url_helper.rb    |  355 --
 .../lib/action_view/helpers/atom_feed_helper.rb    |  203 -
 actionpack/lib/action_view/helpers/cache_helper.rb |  196 -
 actionpack/lib/action_view/helpers/csrf_helper.rb  |   30 -
 actionpack/lib/action_view/helpers/date_helper.rb  | 1083 ------
 actionpack/lib/action_view/helpers/form_helper.rb  | 1880 ----------
 .../lib/action_view/helpers/form_options_helper.rb |  838 -----
 .../lib/action_view/helpers/form_tag_helper.rb     |  785 ----
 .../lib/action_view/helpers/javascript_helper.rb   |  117 -
 .../lib/action_view/helpers/number_helper.rb       |  442 ---
 .../lib/action_view/helpers/record_tag_helper.rb   |  106 -
 .../lib/action_view/helpers/rendering_helper.rb    |   90 -
 actionpack/lib/action_view/helpers/tag_helper.rb   |  173 -
 actionpack/lib/action_view/helpers/tags.rb         |   39 -
 .../helpers/tags/collection_check_boxes.rb         |   44 -
 .../action_view/helpers/tags/collection_helpers.rb |   84 -
 .../lib/action_view/helpers/tags/color_field.rb    |   25 -
 .../lib/action_view/helpers/tags/datetime_field.rb |   22 -
 actionpack/lib/action_view/helpers/tags/label.rb   |   66 -
 actionpack/lib/action_view/helpers/tags/select.rb  |   40 -
 actionpack/lib/action_view/helpers/text_helper.rb  |  443 ---
 .../lib/action_view/helpers/translation_helper.rb  |  103 -
 actionpack/lib/action_view/helpers/url_helper.rb   |  635 ----
 actionpack/lib/action_view/log_subscriber.rb       |   30 -
 actionpack/lib/action_view/lookup_context.rb       |  248 --
 actionpack/lib/action_view/railtie.rb              |   43 -
 .../lib/action_view/renderer/partial_renderer.rb   |  492 ---
 .../renderer/streaming_template_renderer.rb        |  103 -
 .../lib/action_view/renderer/template_renderer.rb  |   96 -
 actionpack/lib/action_view/routing_url_for.rb      |  107 -
 actionpack/lib/action_view/template.rb             |  339 --
 actionpack/lib/action_view/template/error.rb       |  138 -
 .../lib/action_view/template/handlers/erb.rb       |  146 -
 actionpack/lib/action_view/template/resolver.rb    |  326 --
 actionpack/lib/action_view/template/text.rb        |   34 -
 actionpack/lib/action_view/template/types.rb       |   57 -
 actionpack/lib/action_view/test_case.rb            |  270 --
 actionpack/lib/action_view/testing/resolvers.rb    |   50 -
 .../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 -
 actionpack/test/abstract/.helper_test.rb.swp       |  Bin 12288 -> 0 bytes
 .../test/abstract/abstract_controller_test.rb      |  261 --
 actionpack/test/abstract/collector_test.rb         |    2 +-
 actionpack/test/abstract/helper_test.rb            |  121 -
 actionpack/test/abstract/layouts_test.rb           |  383 --
 actionpack/test/abstract/render_test.rb            |  102 -
 actionpack/test/abstract_unit.rb                   |   46 +-
 .../activerecord/form_helper_activerecord_test.rb  |   91 -
 .../test/assertions/response_assertions_test.rb    |   18 +-
 .../test/controller/action_pack_assertions_test.rb |   34 +-
 actionpack/test/controller/assert_select_test.rb   |   27 +-
 actionpack/test/controller/base_test.rb            |   32 +-
 actionpack/test/controller/caching_test.rb         |   55 +-
 actionpack/test/controller/capture_test.rb         |   79 -
 actionpack/test/controller/filters_test.rb         |   42 +-
 actionpack/test/controller/flash_hash_test.rb      |   10 +
 actionpack/test/controller/flash_test.rb           |   12 +-
 actionpack/test/controller/helper_test.rb          |    6 +
 .../controller/http_basic_authentication_test.rb   |    7 +
 .../controller/http_digest_authentication_test.rb  |    2 +-
 .../controller/http_token_authentication_test.rb   |    2 +-
 actionpack/test/controller/integration_test.rb     |   37 +
 actionpack/test/controller/layout_test.rb          |  262 --
 actionpack/test/controller/live_stream_test.rb     |  169 +-
 .../test/controller/localized_templates_test.rb    |   11 +
 actionpack/test/controller/log_subscriber_test.rb  |   11 +
 .../test/controller/mime/accept_format_test.rb     |   94 +
 actionpack/test/controller/mime/respond_to_test.rb |  773 ++++
 .../test/controller/mime/respond_with_test.rb      |  714 ++++
 actionpack/test/controller/mime_responds_test.rb   | 1254 -------
 .../test/controller/new_base/render_body_test.rb   |  170 +
 .../test/controller/new_base/render_html_test.rb   |  190 +
 .../new_base/render_implicit_action_test.rb        |   17 +-
 .../test/controller/new_base/render_plain_test.rb  |  168 +
 .../controller/new_base/render_streaming_test.rb   |    6 +-
 .../controller/new_base/render_template_test.rb    |    4 +-
 .../test/controller/new_base/render_text_test.rb   |   51 +-
 .../parameters/parameters_permit_test.rb           |   32 +-
 .../parameters/parameters_require_test.rb          |   10 -
 actionpack/test/controller/params_wrapper_test.rb  |   20 +
 .../test/controller/record_identifier_test.rb      |   34 -
 actionpack/test/controller/render_js_test.rb       |    2 +-
 actionpack/test/controller/render_json_test.rb     |    4 +-
 actionpack/test/controller/render_test.rb          | 1648 ++-------
 .../controller/request_forgery_protection_test.rb  |   98 +-
 actionpack/test/controller/required_params_test.rb |    8 +
 actionpack/test/controller/resources_test.rb       |    5 +-
 actionpack/test/controller/routing_test.rb         |   42 +-
 actionpack/test/controller/send_file_test.rb       |   16 +-
 actionpack/test/controller/test_case_test.rb       |   43 +-
 actionpack/test/controller/url_for_test.rb         |   33 +-
 actionpack/test/controller/webservice_test.rb      |    3 +-
 actionpack/test/dispatch/cookies_test.rb           |  269 +-
 actionpack/test/dispatch/debug_exceptions_test.rb  |   76 +
 actionpack/test/dispatch/header_test.rb            |    2 +
 actionpack/test/dispatch/live_response_test.rb     |   15 +-
 actionpack/test/dispatch/mime_type_test.rb         |   11 +-
 actionpack/test/dispatch/mount_test.rb             |   13 +-
 actionpack/test/dispatch/prefix_generation_test.rb |  152 +-
 actionpack/test/dispatch/rack_test.rb              |   18 +-
 .../dispatch/request/json_params_parsing_test.rb   |    9 +-
 .../request/multipart_params_parsing_test.rb       |    3 +-
 .../dispatch/request/query_string_parsing_test.rb  |   15 +
 actionpack/test/dispatch/request/session_test.rb   |   16 +
 .../request/url_encoded_params_parsing_test.rb     |   52 +-
 actionpack/test/dispatch/request_test.rb           |   43 +-
 actionpack/test/dispatch/response_test.rb          |   27 +-
 actionpack/test/dispatch/routing/inspector_test.rb |   90 +-
 actionpack/test/dispatch/routing_test.rb           |  549 ++-
 actionpack/test/dispatch/ssl_test.rb               |   36 +
 actionpack/test/dispatch/static_test.rb            |   30 +-
 actionpack/test/dispatch/url_generation_test.rb    |   32 +-
 actionpack/test/fixtures/developer.rb              |   10 -
 .../test/fixtures/digestor/messages/show.html.erb  |   14 -
 ...ted_fragment_cached_with_variant.html+phone.erb |    3 +
 actionpack/test/fixtures/helpers/abc_helper.rb     |    2 -
 .../test/fixtures/layout_tests/layouts/symlinked   |    1 -
 .../test/fixtures/localized/hello_world.it.erb     |    1 +
 actionpack/test/fixtures/multipart/mona_lisa.jpg   |  Bin 0 -> 159528 bytes
 .../variant_any_implicit_render.html+phablet.erb   |    1 +
 .../variant_any_implicit_render.html+tablet.erb    |    1 +
 ...iant_inline_syntax_without_block.html+phone.erb |    1 +
 .../variant_plus_none_for_format.html.erb          |    1 +
 ...variant_with_implicit_rendering.html+mobile.erb |    1 +
 .../respond_with_additional_params.html.erb}       |    0
 .../\345\205\254\345\205\261/foo/bar.html"         |    1 +
 .../fixtures/\345\205\254\345\205\261/foo/baz.css" |    3 +
 .../\345\205\254\345\205\261/foo/index.html"       |    1 +
 ...2\223\343\201\253\343\201\241\343\201\257.html" |    1 +
 .../fixtures/\345\205\254\345\205\261/index.html"  |    1 +
 .../test/journey/gtg/transition_table_test.rb      |    4 +-
 actionpack/test/journey/router/utils_test.rb       |    8 +-
 actionpack/test/journey/router_test.rb             |   13 +-
 actionpack/test/lib/controller/fake_models.rb      |  105 +-
 actionpack/test/template/asset_tag_helper_test.rb  |  760 ----
 .../test/template/compiled_templates_test.rb       |   63 -
 actionpack/test/template/date_helper_test.rb       | 3201 ----------------
 .../test/template/dependency_tracker_test.rb       |   74 -
 actionpack/test/template/digestor_test.rb          |  256 --
 actionpack/test/template/erb_util_test.rb          |   60 -
 .../test/template/form_collections_helper_test.rb  |  349 --
 actionpack/test/template/form_helper_test.rb       | 3019 ---------------
 .../test/template/form_options_helper_test.rb      | 1320 -------
 actionpack/test/template/form_tag_helper_test.rb   |  642 ----
 actionpack/test/template/javascript_helper_test.rb |  104 -
 actionpack/test/template/lookup_context_test.rb    |  263 --
 actionpack/test/template/number_helper_test.rb     |  152 -
 actionpack/test/template/render_test.rb            |  542 ---
 actionpack/test/template/streaming_render_test.rb  |  109 -
 actionpack/test/template/tag_helper_test.rb        |  130 -
 actionpack/test/template/template_error_test.rb    |   13 -
 actionpack/test/template/template_test.rb          |  207 --
 actionpack/test/template/test_case_test.rb         |  367 --
 .../test/template/testing/fixture_resolver_test.rb |   18 -
 actionpack/test/template/text_helper_test.rb       |  470 ---
 .../test/template/translation_helper_test.rb       |  138 -
 actionpack/test/template/url_helper_test.rb        |  862 -----
 actionview/CHANGELOG.md                            |  401 ++
 actionview/MIT-LICENSE                             |   21 +
 actionview/README.rdoc                             |   34 +
 actionview/RUNNING_UNIT_TESTS.rdoc                 |   27 +
 actionview/Rakefile                                |   80 +
 actionview/actionview.gemspec                      |   29 +
 actionview/lib/action_view.rb                      |   97 +
 actionview/lib/action_view/base.rb                 |  209 ++
 .../lib/action_view/buffers.rb                     |    0
 .../lib/action_view/context.rb                     |    0
 actionview/lib/action_view/dependency_tracker.rb   |  135 +
 actionview/lib/action_view/digestor.rb             |  122 +
 actionview/lib/action_view/flows.rb                |   76 +
 actionview/lib/action_view/gem_version.rb          |   15 +
 actionview/lib/action_view/helpers.rb              |   64 +
 .../lib/action_view/helpers/active_model_helper.rb |   49 +
 .../lib/action_view/helpers/asset_tag_helper.rb    |  322 ++
 .../lib/action_view/helpers/asset_url_helper.rb    |  355 ++
 .../lib/action_view/helpers/atom_feed_helper.rb    |  203 +
 actionview/lib/action_view/helpers/cache_helper.rb |  200 +
 .../lib/action_view/helpers/capture_helper.rb      |    0
 .../lib/action_view/helpers/controller_helper.rb   |    0
 actionview/lib/action_view/helpers/csrf_helper.rb  |   33 +
 actionview/lib/action_view/helpers/date_helper.rb  | 1094 ++++++
 .../lib/action_view/helpers/debug_helper.rb        |    0
 actionview/lib/action_view/helpers/form_helper.rb  | 1876 ++++++++++
 .../lib/action_view/helpers/form_options_helper.rb |  843 +++++
 .../lib/action_view/helpers/form_tag_helper.rb     |  752 ++++
 .../lib/action_view/helpers/javascript_helper.rb   |   75 +
 .../lib/action_view/helpers/number_helper.rb       |  434 +++
 .../action_view/helpers/output_safety_helper.rb    |    0
 .../lib/action_view/helpers/record_tag_helper.rb   |  108 +
 .../lib/action_view/helpers/rendering_helper.rb    |   98 +
 .../lib/action_view/helpers/sanitize_helper.rb     |    0
 actionview/lib/action_view/helpers/tag_helper.rb   |  176 +
 actionview/lib/action_view/helpers/tags.rb         |   41 +
 .../lib/action_view/helpers/tags/base.rb           |    0
 .../lib/action_view/helpers/tags/check_box.rb      |    0
 .../lib/action_view/helpers/tags/checkable.rb      |    0
 .../helpers/tags/collection_check_boxes.rb         |   53 +
 .../action_view/helpers/tags/collection_helpers.rb |   85 +
 .../helpers/tags/collection_radio_buttons.rb       |    0
 .../action_view/helpers/tags/collection_select.rb  |    0
 .../lib/action_view/helpers/tags/color_field.rb    |   25 +
 .../lib/action_view/helpers/tags/date_field.rb     |    0
 .../lib/action_view/helpers/tags/date_select.rb    |    0
 .../lib/action_view/helpers/tags/datetime_field.rb |   22 +
 .../helpers/tags/datetime_local_field.rb           |    0
 .../action_view/helpers/tags/datetime_select.rb    |    0
 .../lib/action_view/helpers/tags/email_field.rb    |    0
 .../lib/action_view/helpers/tags/file_field.rb     |    0
 .../helpers/tags/grouped_collection_select.rb      |    0
 .../lib/action_view/helpers/tags/hidden_field.rb   |    0
 actionview/lib/action_view/helpers/tags/label.rb   |   65 +
 .../lib/action_view/helpers/tags/month_field.rb    |    0
 .../lib/action_view/helpers/tags/number_field.rb   |    0
 .../lib/action_view/helpers/tags/password_field.rb |    0
 .../lib/action_view/helpers/tags/radio_button.rb   |    0
 .../lib/action_view/helpers/tags/range_field.rb    |    0
 .../lib/action_view/helpers/tags/search_field.rb   |    0
 actionview/lib/action_view/helpers/tags/select.rb  |   41 +
 .../lib/action_view/helpers/tags/tel_field.rb      |    0
 .../lib/action_view/helpers/tags/text_area.rb      |    0
 .../lib/action_view/helpers/tags/text_field.rb     |    0
 .../lib/action_view/helpers/tags/time_field.rb     |    0
 .../lib/action_view/helpers/tags/time_select.rb    |    0
 .../action_view/helpers/tags/time_zone_select.rb   |    0
 .../lib/action_view/helpers/tags/url_field.rb      |    0
 .../lib/action_view/helpers/tags/week_field.rb     |    0
 actionview/lib/action_view/helpers/text_helper.rb  |  450 +++
 .../lib/action_view/helpers/translation_helper.rb  |  111 +
 actionview/lib/action_view/helpers/url_helper.rb   |  630 ++++
 actionview/lib/action_view/layouts.rb              |  426 +++
 .../lib/action_view/locale/en.yml                  |    0
 actionview/lib/action_view/log_subscriber.rb       |   44 +
 actionview/lib/action_view/lookup_context.rb       |  257 ++
 .../lib/action_view/model_naming.rb                |    0
 .../lib/action_view/path_set.rb                    |    0
 actionview/lib/action_view/railtie.rb              |   49 +
 .../lib/action_view/record_identifier.rb           |    0
 .../lib/action_view/renderer/abstract_renderer.rb  |    0
 .../lib/action_view/renderer/partial_renderer.rb   |  492 +++
 .../lib/action_view/renderer/renderer.rb           |    0
 .../renderer/streaming_template_renderer.rb        |  103 +
 .../lib/action_view/renderer/template_renderer.rb  |  102 +
 actionview/lib/action_view/rendering.rb            |  145 +
 actionview/lib/action_view/routing_url_for.rb      |  109 +
 .../lib/action_view/tasks/dependencies.rake        |    0
 actionview/lib/action_view/template.rb             |  342 ++
 actionview/lib/action_view/template/error.rb       |  141 +
 .../lib/action_view/template/handlers.rb           |    0
 .../lib/action_view/template/handlers/builder.rb   |    0
 .../lib/action_view/template/handlers/erb.rb       |  145 +
 .../lib/action_view/template/handlers/raw.rb       |    0
 actionview/lib/action_view/template/html.rb        |   34 +
 actionview/lib/action_view/template/resolver.rb    |  346 ++
 actionview/lib/action_view/template/text.rb        |   34 +
 actionview/lib/action_view/template/types.rb       |   57 +
 actionview/lib/action_view/test_case.rb            |  272 ++
 actionview/lib/action_view/testing/resolvers.rb    |   54 +
 .../lib/action_view/vendor/html-scanner.rb         |    0
 .../vendor/html-scanner/html/document.rb           |    0
 .../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            |    0
 actionview/lib/action_view/version.rb              |    8 +
 actionview/lib/action_view/view_paths.rb           |   96 +
 actionview/test/abstract_unit.rb                   |  341 ++
 .../abstract/abstract_controller_test.rb           |  262 ++
 actionview/test/actionpack/abstract/helper_test.rb |  127 +
 .../test/actionpack/abstract/layouts_test.rb       |  384 ++
 actionview/test/actionpack/abstract/render_test.rb |  103 +
 .../testing/me3/formatted.html.erb                 |    0
 .../abstract_controller/testing/me3/index.erb      |    0
 .../abstract_controller/testing/me4/index.erb      |    0
 .../abstract_controller/testing/me5/index.erb      |    0
 .../abstract/views/action_with_ivars.erb           |    0
 .../actionpack}/abstract/views/helper_test.erb     |    0
 .../test/actionpack}/abstract/views/index.erb      |    0
 .../layouts/abstract_controller/testing/me4.erb    |    0
 .../abstract/views/layouts/application.erb         |    0
 .../actionpack}/abstract/views/naked_render.erb    |    0
 .../test/actionpack/controller/capture_test.rb     |   81 +
 .../test/actionpack/controller/layout_test.rb      |  256 ++
 .../test/actionpack/controller/render_test.rb      | 1335 +++++++
 .../test/actionpack}/controller/view_paths_test.rb |    0
 .../test/active_record_unit.rb                     |    0
 .../test/activerecord/controller_runtime_test.rb   |    0
 .../activerecord/form_helper_activerecord_test.rb  |   91 +
 .../test/activerecord/polymorphic_routes_test.rb   |    0
 ...nder_partial_with_record_identification_test.rb |    0
 .../test/fixtures/_top_level_partial.html.erb      |    0
 .../test/fixtures/_top_level_partial_only.erb      |    1 +
 .../bad_customers/_bad_customer.html.erb           |    1 +
 .../actionpack}/customers/_customer.html.erb       |    0
 .../test/fixtures/actionpack}/fun/games/_form.erb  |    0
 .../fixtures/actionpack}/fun/games/hello_world.erb |    0
 .../good_customers/_good_customer.html.erb         |    0
 .../test/fixtures/actionpack}/hello.html           |    0
 .../actionpack}/layout_tests/alt/layouts/alt.erb   |    0
 .../layouts/controller_name_space/nested.erb       |    0
 .../actionpack}/layout_tests/layouts/item.erb      |    0
 .../layout_tests/layouts/layout_test.erb           |    0
 .../layouts/multiple_extensions.html.erb           |    0
 .../layouts/symlinked/symlinked_layout.erb         |    5 +
 .../layouts/third_party_template_library.mab       |    0
 .../actionpack}/layout_tests/views/goodbye.erb     |    0
 .../actionpack}/layout_tests/views/hello.erb       |    0
 .../fixtures/actionpack}/layouts/_column.html.erb  |    0
 .../fixtures/actionpack/layouts/_customers.erb     |    1 +
 .../actionpack}/layouts/_partial_and_yield.erb     |    0
 .../fixtures/actionpack}/layouts/_yield_only.erb   |    0
 .../actionpack}/layouts/_yield_with_params.erb     |    0
 .../actionpack/layouts/block_with_layout.erb       |    3 +
 .../fixtures/actionpack/layouts/builder.builder    |    3 +
 .../actionpack/layouts/partial_with_layout.erb     |    3 +
 .../fixtures/actionpack/layouts/standard.html.erb  |    1 +
 .../fixtures/actionpack}/layouts/streaming.erb     |    0
 .../actionpack/layouts/talk_from_action.erb        |    2 +
 .../actionpack/layouts/with_html_partial.html.erb  |    1 +
 .../test/fixtures/actionpack/layouts/xhr.html.erb  |    2 +
 .../test/fixtures/actionpack/layouts/yield.erb     |    2 +
 .../layouts/yield_with_render_inline_inside.erb    |    0
 .../layouts/yield_with_render_partial_inside.erb   |    0
 .../actionpack}/quiz/questions/_question.html.erb  |    0
 .../test/fixtures/actionpack/shared.html.erb       |    1 +
 .../actionpack/test/_changing_priority.html.erb    |    1 +
 .../actionpack/test/_changing_priority.json.erb    |    1 +
 .../fixtures/actionpack/test/_counter.html.erb     |    1 +
 .../test/fixtures/actionpack/test/_customer.erb    |    1 +
 .../fixtures/actionpack/test/_customer_counter.erb |    1 +
 .../actionpack/test/_customer_counter_with_as.erb  |    1 +
 .../actionpack/test/_customer_greeting.erb         |    1 +
 .../actionpack/test/_customer_with_var.erb         |    1 +
 .../test/_directory/_partial_with_locales.html.erb |    1 +
 .../actionpack/test/_first_json_partial.json.erb   |    1 +
 .../test/fixtures/actionpack/test}/_form.erb       |    0
 .../fixtures/actionpack/test/_hash_greeting.erb    |    1 +
 .../test/fixtures/actionpack/test/_hash_object.erb |    2 +
 .../test/fixtures/actionpack/test/_hello.builder   |    1 +
 .../actionpack/test/_json_change_priority.json.erb |    0
 .../fixtures/actionpack/test/_labelling_form.erb   |    1 +
 .../actionpack/test/_layout_for_partial.html.erb   |    3 +
 .../test/fixtures/actionpack/test/_partial.erb     |    1 +
 .../fixtures/actionpack/test/_partial.html.erb     |    1 +
 .../test/fixtures/actionpack/test/_partial.js.erb  |    1 +
 .../test/_partial_for_use_in_layout.html.erb       |    1 +
 .../actionpack/test/_partial_html_erb.html.erb     |    1 +
 .../test/_partial_name_local_variable.erb          |    1 +
 .../fixtures/actionpack/test/_partial_only.erb     |    1 +
 .../actionpack/test/_partial_only_html.html        |    1 +
 .../actionpack/test/_partial_with_partial.erb      |    2 +
 .../test/fixtures/actionpack/test/_person.erb      |    2 +
 .../actionpack/test/_raise_indentation.html.erb    |   13 +
 .../actionpack/test/_second_json_partial.json.erb  |    1 +
 .../actionpack/test/action_talk_to_layout.erb      |    2 +
 .../test/calling_partial_with_layout.html.erb      |    1 +
 .../test/fixtures/actionpack/test/capturing.erb    |    4 +
 .../actionpack/test/change_priority.html.erb       |    2 +
 .../test/fixtures/actionpack/test/content_for.erb  |    1 +
 .../actionpack/test/content_for_concatenated.erb   |    3 +
 .../actionpack/test/content_for_with_parameter.erb |    2 +
 .../test/dot.directory/render_file_with_ivar.erb   |    1 +
 .../actionpack/test/formatted_html_erb.html.erb    |    1 +
 .../actionpack/test/formatted_xml_erb.builder      |    1 +
 .../actionpack/test/formatted_xml_erb.html.erb     |    1 +
 .../actionpack/test/formatted_xml_erb.xml.erb      |    1 +
 .../fixtures/actionpack/test/greeting.html.erb     |    1 +
 .../test/fixtures/actionpack/test/greeting.xml.erb |    1 +
 .../test/fixtures/actionpack/test/hello,world.erb  |    1 +
 .../test/fixtures/actionpack/test/hello.builder    |    4 +
 .../test/fixtures/actionpack/test/hello/hello.erb  |    0
 .../test/fixtures/actionpack/test}/hello_world.erb |    0
 .../actionpack/test/hello_world_container.builder  |    3 +
 .../actionpack/test/hello_world_from_rxml.builder  |    3 +
 .../test/hello_world_with_layout_false.erb         |    0
 .../test/hello_world_with_partial.html.erb         |    2 +
 .../actionpack/test/hello_xml_world.builder        |   11 +
 .../actionpack/test/html_template.html.erb         |    1 +
 .../test/fixtures/actionpack/test/hyphen-ated.erb  |    1 +
 .../test/implicit_content_type.atom.builder        |    2 +
 actionview/test/fixtures/actionpack/test/list.erb  |    1 +
 .../test/non_erb_block_content_for.builder         |    4 +
 .../actionpack/test/potential_conflicts.erb        |    4 +
 .../actionpack/test/proper_block_detection.erb     |    1 +
 .../test/render_file_from_template.html.erb        |    1 +
 .../actionpack/test/render_file_with_ivar.erb      |    1 +
 .../actionpack/test/render_file_with_locals.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 +
 .../actionpack/test/render_to_string_test.erb      |    1 +
 .../actionpack/test/render_two_partials.html.erb   |    2 +
 .../test/using_layout_around_block.html.erb        |    1 +
 .../actionpack/test/with_html_partial.html.erb     |    1 +
 .../fixtures/actionpack/test/with_partial.html.erb |    1 +
 .../fixtures/actionpack/test/with_partial.text.erb |    1 +
 .../actionpack/test/with_xml_template.html.erb     |    1 +
 .../test/fixtures/blog_public/.gitignore           |    0
 .../test/fixtures/blog_public/blog.html            |    0
 .../test/fixtures/blog_public/index.html           |    0
 .../test/fixtures/blog_public/subdir/index.html    |    0
 .../test/fixtures/comments/empty.de.html.erb       |    0
 .../test/fixtures/comments/empty.html.builder      |    0
 .../test/fixtures/comments/empty.html.erb          |    0
 .../test/fixtures/comments/empty.xml.erb           |    0
 .../test/fixtures/companies.yml                    |    0
 actionview/test/fixtures/company.rb                |    9 +
 .../test/fixtures/custom_pattern/another.html.erb  |    0
 .../test/fixtures/custom_pattern/html/another.erb  |    0
 .../test/fixtures/custom_pattern/html/path.erb     |    0
 .../test/fixtures/customers/_customer.html.erb     |    0
 .../test/fixtures/customers/_customer.xml.erb      |    1 +
 .../test/fixtures/db_definitions/sqlite.sql        |    0
 actionview/test/fixtures/developer.rb              |    6 +
 .../test/fixtures/developers.yml                   |    0
 .../test/fixtures/developers/_developer.erb        |    0
 .../test/fixtures/developers_projects.yml          |    0
 .../fixtures/digestor/comments/_comment.html.erb   |    0
 .../fixtures/digestor/comments/_comments.html.erb  |    0
 .../test/fixtures/digestor/events/_event.html.erb  |    0
 .../fixtures/digestor/level/_recursion.html.erb    |    0
 .../digestor/level/below}/_header.html.erb         |    0
 .../fixtures/digestor/level/below/index.html.erb   |    0
 .../fixtures/digestor/level/recursion.html.erb     |    0
 .../test/fixtures/digestor/messages/_form.html.erb |    0
 .../fixtures/digestor/messages}/_header.html.erb   |    0
 .../fixtures/digestor/messages/_message.html.erb   |    0
 .../digestor/messages/actions/_move.html.erb       |    0
 .../test/fixtures/digestor/messages/edit.html.erb  |    0
 .../test/fixtures/digestor/messages/index.html.erb |    0
 .../fixtures/digestor/messages/new.html+iphone.erb |   15 +
 .../test/fixtures/digestor/messages/show.html.erb  |   14 +
 .../test/fixtures/fun/games/_game.erb              |    0
 .../test/fixtures/fun/games/hello_world.erb        |    0
 .../test/fixtures/fun/serious/games/_game.erb      |    0
 .../fragment_cached_without_digest.html.erb        |    3 +
 .../test/fixtures/games/_game.erb                  |    0
 .../good_customers/_good_customer.html.erb         |    0
 .../happy_path/render_action/hello_world.erb       |    0
 actionview/test/fixtures/helpers/abc_helper.rb     |    3 +
 .../test/fixtures/helpers/helpery_test_helper.rb   |    0
 .../helpers_missing/invalid_require_helper.rb      |    0
 .../test/fixtures/layout_tests/alt/hello.erb       |    0
 .../test/fixtures/layouts/_column.html.erb         |    0
 actionview/test/fixtures/layouts/_customers.erb    |    1 +
 .../test/fixtures/layouts/_partial_and_yield.erb   |    0
 .../test/fixtures/layouts/_yield_only.erb          |    0
 .../test/fixtures/layouts/_yield_with_params.erb   |    0
 .../test/fixtures/layouts/streaming.erb            |    0
 actionview/test/fixtures/layouts/yield.erb         |    2 +
 .../layouts/yield_with_render_inline_inside.erb    |    0
 .../layouts/yield_with_render_partial_inside.erb   |    0
 {actionpack => actionview}/test/fixtures/mascot.rb |    0
 .../test/fixtures/mascots.yml                      |    0
 .../test/fixtures/mascots/_mascot.html.erb         |    0
 .../test/fixtures/multipart/bracketed_utf8_param   |    5 +
 .../test/fixtures/multipart/single_utf8_param      |    5 +
 .../test/fixtures/override/test/hello_world.erb    |    0
 .../test/fixtures/override2/layouts/test/sub.erb   |    0
 .../test/fixtures/plain_text.raw                   |    0
 .../test/fixtures/plain_text_with_characters.raw   |    0
 .../test/fixtures/project.rb                       |    0
 .../test/fixtures/projects.yml                     |    0
 .../test/fixtures/projects/_project.erb            |    0
 .../test/fixtures/public/.gitignore                |    0
 .../test/fixtures/public/elsewhere/cools.js        |    0
 .../test/fixtures/public/elsewhere/file.css        |    0
 actionview/test/fixtures/public/foo/baz.css        |    3 +
 .../fixtures/public/javascripts/application.js     |    0
 .../test/fixtures/public/javascripts/bank.js       |    0
 .../fixtures/public/javascripts/common.javascript  |    0
 .../test/fixtures/public/javascripts/controls.js   |    0
 .../test/fixtures/public/javascripts/dragdrop.js   |    0
 .../test/fixtures/public/javascripts/effects.js    |    0
 .../test/fixtures/public/javascripts/prototype.js  |    0
 .../test/fixtures/public/javascripts/robber.js     |    0
 .../fixtures/public/javascripts/subdir/subdir.js   |    0
 .../fixtures/public/javascripts/version.1.0.js     |    0
 .../test/fixtures/public/stylesheets/bank.css      |    0
 .../test/fixtures/public/stylesheets/random.styles |    0
 .../test/fixtures/public/stylesheets/robber.css    |    0
 .../fixtures/public/stylesheets/subdir/subdir.css  |    0
 .../fixtures/public/stylesheets/version.1.0.css    |    0
 .../test/fixtures/replies.yml                      |    0
 .../test/fixtures/replies/_reply.erb               |    0
 {actionpack => actionview}/test/fixtures/reply.rb  |    0
 .../respond_to/using_defaults_with_all.html.erb    |    1 +
 actionview/test/fixtures/ruby_template.ruby        |    2 +
 .../test/fixtures/scope/test/modgreet.erb          |    0
 actionview/test/fixtures/shared.html.erb           |    1 +
 .../test/fixtures/test/_200.html.erb               |    0
 .../fixtures/test/_b_layout_for_partial.html.erb   |    0
 .../_b_layout_for_partial_with_object.html.erb     |    0
 ...layout_for_partial_with_object_counter.html.erb |    0
 .../test/fixtures/test/_changing_priority.html.erb |    1 +
 .../test/fixtures/test/_changing_priority.json.erb |    1 +
 .../test/_content_tag_nested_in_content_tag.erb    |    0
 actionview/test/fixtures/test/_counter.html.erb    |    1 +
 actionview/test/fixtures/test/_customer.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 +
 .../test/fixtures/test/_from_helper.erb            |    0
 .../fixtures/test/_json_change_priority.json.erb   |    0
 .../test/fixtures/test/_label_with_block.erb       |    0
 .../test/_layout_for_block_with_args.html.erb      |    0
 .../fixtures/test/_layout_for_partial.html.erb     |    3 +
 .../test/_layout_with_partial_and_yield.html.erb   |    0
 .../test/fixtures/test/_local_inspector.html.erb   |    0
 .../test/fixtures/test/_object_inspector.erb       |    0
 .../test/fixtures/test/_one.html.erb               |    0
 actionview/test/fixtures/test/_partial.erb         |    1 +
 actionview/test/fixtures/test/_partial.html.erb    |    1 +
 actionview/test/fixtures/test/_partial.js.erb      |    1 +
 .../test/_partial_for_use_in_layout.html.erb       |    1 +
 .../fixtures/test/_partial_name_local_variable.erb |    1 +
 actionview/test/fixtures/test/_partial_only.erb    |    1 +
 .../test/fixtures/test/_partial_with_layout.erb    |    0
 .../test/_partial_with_layout_block_content.erb    |    0
 .../test/_partial_with_layout_block_partial.erb    |    0
 .../test/_partial_with_only_html_version.html.erb  |    0
 .../test/fixtures/test/_partial_with_partial.erb   |    2 +
 .../test/fixtures/test/_raise.html.erb             |    0
 .../test/fixtures/test/_raise_indentation.html.erb |   13 +
 .../fixtures/test/_second_json_partial.json.erb    |    1 +
 .../test/fixtures/test/_two.html.erb               |    0
 .../test/fixtures/test/_utf8_partial.html.erb      |    0
 .../fixtures/test/_utf8_partial_magic.html.erb     |    0
 .../test/fixtures/test/basic.html.erb              |    0
 .../test/calling_partial_with_layout.html.erb      |    1 +
 .../test/fixtures/test/change_priority.html.erb    |    2 +
 .../test/fixtures/test/dont_pick_me                |    0
 .../test/dot.directory/render_file_with_ivar.erb   |    1 +
 actionview/test/fixtures/test/greeting.xml.erb     |    1 +
 actionview/test/fixtures/test/hello.builder        |    4 +
 .../test/fixtures/test/hello/hello.erb             |    0
 .../test/fixtures/test/hello_world.da.html.erb     |    0
 .../test/fixtures/test}/hello_world.erb            |    0
 .../test/fixtures/test/hello_world.erb~            |    0
 .../test/fixtures/test/hello_world.html+phone.erb  |    1 +
 .../test/fixtures/test/hello_world.pt-BR.html.erb  |    0
 .../test/fixtures/test/hello_world.text+phone.erb  |    1 +
 .../test/hello_world_with_partial.html.erb         |    2 +
 .../test/fixtures/test/html_template.html.erb      |    1 +
 .../test/fixtures/test/layout_render_file.erb      |    0
 .../test/fixtures/test/layout_render_object.erb    |    0
 actionview/test/fixtures/test/list.erb             |    1 +
 .../fixtures/test/malformed/malformed.en.html.erb~ |    0
 .../test/fixtures/test/malformed/malformed.erb~    |    0
 .../fixtures/test/malformed/malformed.html.erb~    |    0
 .../test/fixtures/test/malformed/malformed~        |    0
 .../test/fixtures/test/nested_layout.erb           |    0
 .../test/fixtures/test/nested_streaming.erb        |    0
 .../test/fixtures/test/one.html.erb                |    0
 .../test/fixtures/test/render_file_with_ivar.erb   |    1 +
 .../test/fixtures/test/render_file_with_locals.erb |    1 +
 .../test/render_file_with_locals_and_default.erb   |    1 +
 .../test/render_partial_inside_directory.html.erb  |    1 +
 .../fixtures/test/render_two_partials.html.erb     |    2 +
 .../test/fixtures/test/streaming.erb               |    0
 .../test/fixtures/test/streaming_buster.erb        |    0
 .../test/fixtures/test/sub_template_raise.html.erb |    0
 .../test/fixtures/test/template.erb                |    0
 .../fixtures/test/update_element_with_capture.erb  |    0
 .../test/fixtures/test/utf8.html.erb               |    0
 .../test/fixtures/test/utf8_magic.html.erb         |    0
 .../test/utf8_magic_with_bare_partial.html.erb     |    0
 {actionpack => actionview}/test/fixtures/topic.rb  |    0
 .../test/fixtures/topics.yml                       |    0
 .../test/fixtures/topics/_topic.html.erb           |    0
 .../test/fixtures/translations/templates/array.erb |    0
 .../fixtures/translations/templates/default.erb    |    0
 .../test/fixtures/translations/templates/found.erb |    0
 .../fixtures/translations/templates/missing.erb    |    0
 .../test/fixtures/with_format.json.erb             |    0
 actionview/test/lib/controller/fake_models.rb      |  185 +
 .../test/template/active_model_helper_test.rb      |    0
 actionview/test/template/asset_tag_helper_test.rb  |  762 ++++
 .../test/template/atom_feed_helper_test.rb         |    0
 .../test/template/capture_helper_test.rb           |    0
 .../test/template/compiled_templates_test.rb       |   62 +
 .../test/template/date_helper_i18n_test.rb         |    0
 actionview/test/template/date_helper_test.rb       | 3227 ++++++++++++++++
 .../test/template/debug_helper_test.rb             |    0
 .../test/template/dependency_tracker_test.rb       |  180 +
 actionview/test/template/digestor_test.rb          |  311 ++
 .../test/template/erb/form_for_test.rb             |    0
 .../test/template/erb/helper.rb                    |    0
 .../test/template/erb/tag_helper_test.rb           |    0
 actionview/test/template/erb_util_test.rb          |  106 +
 .../test/template/form_collections_helper_test.rb  |  408 +++
 actionview/test/template/form_helper_test.rb       | 3067 ++++++++++++++++
 .../test/template/form_options_helper_i18n_test.rb |    0
 .../test/template/form_options_helper_test.rb      | 1345 +++++++
 actionview/test/template/form_tag_helper_test.rb   |  634 ++++
 .../test/template/html-scanner/cdata_node_test.rb  |    0
 .../test/template/html-scanner/document_test.rb    |    0
 .../test/template/html-scanner/node_test.rb        |    0
 .../test/template/html-scanner/sanitizer_test.rb   |    0
 .../test/template/html-scanner/tag_node_test.rb    |    0
 .../test/template/html-scanner/text_node_test.rb   |    0
 .../test/template/html-scanner/tokenizer_test.rb   |    0
 actionview/test/template/html_test.rb              |   17 +
 actionview/test/template/javascript_helper_test.rb |   69 +
 .../test/template/log_subscriber_test.rb           |    0
 actionview/test/template/lookup_context_test.rb    |  282 ++
 actionview/test/template/number_helper_test.rb     |  194 +
 .../test/template/output_buffer_test.rb            |    0
 .../test/template/output_safety_helper_test.rb     |    0
 .../test/template/record_identifier_test.rb        |    0
 .../test/template/record_tag_helper_test.rb        |    0
 actionview/test/template/render_test.rb            |  553 +++
 .../test/template/resolver_patterns_test.rb        |    0
 .../test/template/sanitize_helper_test.rb          |    0
 actionview/test/template/streaming_render_test.rb  |  108 +
 actionview/test/template/tag_helper_test.rb        |  134 +
 actionview/test/template/template_error_test.rb    |   20 +
 actionview/test/template/template_test.rb          |  200 +
 actionview/test/template/test_case_test.rb         |  366 ++
 .../test/template/test_test.rb                     |    0
 .../test/template/testing/fixture_resolver_test.rb |   18 +
 .../test/template/testing/null_resolver_test.rb    |    0
 actionview/test/template/text_helper_test.rb       |  487 +++
 actionview/test/template/text_test.rb              |   17 +
 .../test/template/translation_helper_test.rb       |  154 +
 actionview/test/template/url_helper_test.rb        |  798 ++++
 .../test/tmp/.gitkeep                              |    0
 activemodel/CHANGELOG.md                           |  233 +-
 activemodel/MIT-LICENSE                            |    2 +-
 activemodel/README.rdoc                            |    6 +-
 activemodel/Rakefile                               |    6 +-
 activemodel/activemodel.gemspec                    |    4 +-
 activemodel/examples/validations.rb                |    5 +-
 activemodel/lib/active_model.rb                    |    8 +-
 activemodel/lib/active_model/attribute_methods.rb  |   50 +-
 activemodel/lib/active_model/callbacks.rb          |   43 +-
 activemodel/lib/active_model/conversion.rb         |    6 +-
 .../deprecated_mass_assignment_security.rb         |   21 -
 activemodel/lib/active_model/dirty.rb              |   62 +-
 activemodel/lib/active_model/errors.rb             |   70 +-
 activemodel/lib/active_model/gem_version.rb        |   15 +
 activemodel/lib/active_model/lint.rb               |    2 +-
 activemodel/lib/active_model/model.rb              |    2 +-
 activemodel/lib/active_model/naming.rb             |   16 +-
 activemodel/lib/active_model/secure_password.rb    |   33 +-
 activemodel/lib/active_model/serialization.rb      |    2 +-
 activemodel/lib/active_model/serializers/json.rb   |    4 +-
 activemodel/lib/active_model/serializers/xml.rb    |   14 +-
 activemodel/lib/active_model/translation.rb        |    2 +-
 activemodel/lib/active_model/validations.rb        |   27 +-
 .../lib/active_model/validations/absence.rb        |    2 +-
 .../lib/active_model/validations/acceptance.rb     |   12 +-
 .../lib/active_model/validations/callbacks.rb      |   11 +-
 .../lib/active_model/validations/clusivity.rb      |   27 +-
 .../lib/active_model/validations/confirmation.rb   |   12 +-
 .../lib/active_model/validations/exclusion.rb      |    8 +-
 activemodel/lib/active_model/validations/format.rb |   40 +-
 .../lib/active_model/validations/inclusion.rb      |   11 +-
 activemodel/lib/active_model/validations/length.rb |    6 +-
 .../lib/active_model/validations/numericality.rb   |   40 +-
 .../lib/active_model/validations/presence.rb       |    2 +-
 .../lib/active_model/validations/validates.rb      |   10 +-
 activemodel/lib/active_model/validations/with.rb   |    5 +-
 activemodel/lib/active_model/validator.rb          |   36 +-
 activemodel/lib/active_model/version.rb            |   11 +-
 activemodel/test/cases/attribute_methods_test.rb   |   15 +-
 activemodel/test/cases/callbacks_test.rb           |    6 +-
 activemodel/test/cases/conversion_test.rb          |   14 +-
 .../deprecated_mass_assignment_security_test.rb    |   16 -
 activemodel/test/cases/dirty_test.rb               |   57 +-
 activemodel/test/cases/errors_test.rb              |   88 +-
 activemodel/test/cases/helper.rb                   |    3 +
 activemodel/test/cases/model_test.rb               |    2 +-
 activemodel/test/cases/secure_password_test.rb     |  174 +-
 activemodel/test/cases/serialization_test.rb       |   34 +-
 .../cases/serializers/json_serialization_test.rb   |    8 +-
 .../cases/serializers/xml_serialization_test.rb    |   60 +-
 activemodel/test/cases/translation_test.rb         |   43 +-
 .../cases/validations/absence_validation_test.rb   |    6 +-
 .../validations/acceptance_validation_test.rb      |    8 +-
 .../validations/conditional_validation_test.rb     |   50 +-
 .../validations/confirmation_validation_test.rb    |   10 +-
 .../cases/validations/exclusion_validation_test.rb |   18 +-
 .../cases/validations/format_validation_test.rb    |   36 +-
 .../i18n_generate_message_validation_test.rb       |   52 +-
 .../test/cases/validations/i18n_validation_test.rb |  121 +-
 .../cases/validations/inclusion_validation_test.rb |   32 +-
 .../cases/validations/length_validation_test.rb    |    4 +-
 .../validations/numericality_validation_test.rb    |   50 +-
 .../cases/validations/presence_validation_test.rb  |    6 +-
 .../test/cases/validations/validates_test.rb       |   42 +-
 .../cases/validations/validations_context_test.rb  |   25 +-
 .../test/cases/validations/with_validation_test.rb |   61 +-
 activemodel/test/cases/validations_test.rb         |   81 +-
 activemodel/test/models/administrator.rb           |   11 -
 activemodel/test/models/automobile.rb              |    7 +-
 activemodel/test/models/contact.rb                 |    2 +-
 activemodel/test/models/oauthed_user.rb            |   11 -
 activemodel/test/models/reply.rb                   |    6 +-
 activemodel/test/models/user.rb                    |    2 +-
 activerecord/CHANGELOG.md                          | 2923 +++++++--------
 activerecord/MIT-LICENSE                           |    2 +-
 activerecord/README.rdoc                           |    4 +-
 activerecord/RUNNING_UNIT_TESTS.rdoc               |   43 +-
 activerecord/Rakefile                              |   21 +-
 activerecord/activerecord.gemspec                  |    3 +-
 activerecord/examples/performance.rb               |   48 +-
 activerecord/examples/simple.rb                    |    8 +-
 activerecord/lib/active_record.rb                  |   10 +-
 activerecord/lib/active_record/aggregations.rb     |    3 +-
 .../lib/active_record/association_relation.rb      |    4 +
 activerecord/lib/active_record/associations.rb     |  156 +-
 .../active_record/associations/alias_tracker.rb    |   68 +-
 .../lib/active_record/associations/association.rb  |   35 +-
 .../associations/association_scope.rb              |  109 +-
 .../associations/belongs_to_association.rb         |   59 +-
 .../belongs_to_polymorphic_association.rb          |    7 +-
 .../associations/builder/association.rb            |  138 +-
 .../associations/builder/belongs_to.rb             |  144 +-
 .../associations/builder/collection_association.rb |   92 +-
 .../builder/has_and_belongs_to_many.rb             |  135 +-
 .../active_record/associations/builder/has_many.rb |    6 +-
 .../active_record/associations/builder/has_one.rb  |   12 +-
 .../associations/builder/singular_association.rb   |   15 +-
 .../associations/collection_association.rb         |  207 +-
 .../active_record/associations/collection_proxy.rb |   89 +-
 .../has_and_belongs_to_many_association.rb         |   65 -
 .../associations/has_many_association.rb           |   25 +-
 .../associations/has_many_through_association.rb   |   35 +-
 .../associations/has_one_association.rb            |    8 +-
 .../active_record/associations/join_dependency.rb  |  375 +-
 .../join_dependency/join_association.rb            |  150 +-
 .../associations/join_dependency/join_base.rb      |   14 +-
 .../associations/join_dependency/join_part.rb      |   55 +-
 .../lib/active_record/associations/join_helper.rb  |   45 -
 .../lib/active_record/associations/preloader.rb    |  111 +-
 .../associations/preloader/association.rb          |   95 +-
 .../preloader/collection_association.rb            |    4 +-
 .../preloader/has_and_belongs_to_many.rb           |   60 -
 .../associations/preloader/has_many_through.rb     |    2 +-
 .../associations/preloader/singular_association.rb |    6 +-
 .../associations/preloader/through_association.rb  |   84 +-
 .../associations/singular_association.rb           |   11 +-
 .../associations/through_association.rb            |    8 +-
 .../lib/active_record/attribute_assignment.rb      |    7 +-
 .../lib/active_record/attribute_methods.rb         |  155 +-
 .../attribute_methods/before_type_cast.rb          |    3 +-
 .../lib/active_record/attribute_methods/dirty.rb   |   61 +-
 .../lib/active_record/attribute_methods/read.rb    |   85 +-
 .../attribute_methods/serialization.rb             |   61 +-
 .../lib/active_record/attribute_methods/write.rb   |   85 +-
 .../lib/active_record/autosave_association.rb      |  389 +-
 activerecord/lib/active_record/base.rb             |    8 +-
 activerecord/lib/active_record/callbacks.rb        |    8 +-
 .../abstract/connection_pool.rb                    |   11 +-
 .../abstract/database_statements.rb                |   31 +-
 .../connection_adapters/abstract/query_cache.rb    |   26 +-
 .../connection_adapters/abstract/quoting.rb        |    6 +-
 .../connection_adapters/abstract/savepoints.rb     |   21 +
 .../abstract/schema_creation.rb                    |   90 +
 .../abstract/schema_definitions.rb                 |   13 +-
 .../abstract/schema_statements.rb                  |  127 +-
 .../connection_adapters/abstract/transaction.rb    |    4 +
 .../connection_adapters/abstract_adapter.rb        |  124 +-
 .../connection_adapters/abstract_mysql_adapter.rb  |  124 +-
 .../active_record/connection_adapters/column.rb    |   50 +-
 .../connection_specification.rb                    |  274 +-
 .../connection_adapters/mysql2_adapter.rb          |   13 +-
 .../connection_adapters/mysql_adapter.rb           |   37 +-
 .../connection_adapters/postgresql/array_parser.rb |   42 +-
 .../connection_adapters/postgresql/cast.rb         |   42 +-
 .../postgresql/database_statements.rb              |   66 +-
 .../connection_adapters/postgresql/oid.rb          |   43 +-
 .../connection_adapters/postgresql/quoting.rb      |   49 +-
 .../postgresql/schema_statements.rb                |   34 +-
 .../connection_adapters/postgresql_adapter.rb      |  185 +-
 .../connection_adapters/schema_cache.rb            |   37 +-
 .../connection_adapters/sqlite3_adapter.rb         |  125 +-
 .../lib/active_record/connection_handling.rb       |   44 +-
 activerecord/lib/active_record/core.rb             |   95 +-
 activerecord/lib/active_record/counter_cache.rb    |   19 +-
 activerecord/lib/active_record/dynamic_matchers.rb |   17 +-
 activerecord/lib/active_record/enum.rb             |  199 +
 activerecord/lib/active_record/errors.rb           |   27 +-
 activerecord/lib/active_record/fixture_set/file.rb |    3 +-
 activerecord/lib/active_record/fixtures.rb         |  225 +-
 activerecord/lib/active_record/gem_version.rb      |   15 +
 activerecord/lib/active_record/inheritance.rb      |   54 +-
 activerecord/lib/active_record/integration.rb      |   55 +-
 .../lib/active_record/locking/optimistic.rb        |    9 +-
 .../lib/active_record/locking/pessimistic.rb       |    8 +-
 activerecord/lib/active_record/log_subscriber.rb   |   19 +-
 activerecord/lib/active_record/migration.rb        |  137 +-
 .../active_record/migration/command_recorder.rb    |   27 +-
 activerecord/lib/active_record/model_schema.rb     |   21 +-
 .../lib/active_record/nested_attributes.rb         |   22 +-
 activerecord/lib/active_record/no_touching.rb      |   52 +
 activerecord/lib/active_record/null_relation.rb    |   32 +-
 activerecord/lib/active_record/persistence.rb      |   59 +-
 activerecord/lib/active_record/querying.rb         |   27 +-
 activerecord/lib/active_record/railtie.rb          |   69 +-
 .../lib/active_record/railties/databases.rake      |   77 +-
 .../lib/active_record/readonly_attributes.rb       |    6 -
 activerecord/lib/active_record/reflection.rb       |  300 +-
 activerecord/lib/active_record/relation.rb         |  156 +-
 activerecord/lib/active_record/relation/batches.rb |  104 +-
 .../lib/active_record/relation/calculations.rb     |   97 +-
 .../lib/active_record/relation/delegation.rb       |   93 +-
 .../lib/active_record/relation/finder_methods.rb   |  277 +-
 activerecord/lib/active_record/relation/merger.rb  |   47 +-
 .../active_record/relation/predicate_builder.rb    |   97 +-
 .../relation/predicate_builder/array_handler.rb    |   29 +
 .../relation/predicate_builder/relation_handler.rb |   13 +
 .../lib/active_record/relation/query_methods.rb    |  245 +-
 .../lib/active_record/relation/spawn_methods.rb    |    3 +-
 activerecord/lib/active_record/result.rb           |   51 +-
 activerecord/lib/active_record/runtime_registry.rb |    5 +
 activerecord/lib/active_record/sanitization.rb     |   17 +-
 activerecord/lib/active_record/schema_dumper.rb    |   21 +-
 activerecord/lib/active_record/schema_migration.rb |   42 +-
 activerecord/lib/active_record/scoping.rb          |    5 +
 activerecord/lib/active_record/scoping/default.rb  |   23 +-
 activerecord/lib/active_record/scoping/named.rb    |   43 +-
 activerecord/lib/active_record/store.rb            |   85 +-
 .../lib/active_record/tasks/database_tasks.rb      |   78 +-
 .../active_record/tasks/firebird_database_tasks.rb |   56 -
 .../active_record/tasks/mysql_database_tasks.rb    |    3 +-
 .../active_record/tasks/oracle_database_tasks.rb   |   45 -
 .../tasks/postgresql_database_tasks.rb             |    2 +-
 .../tasks/sqlserver_database_tasks.rb              |   48 -
 activerecord/lib/active_record/test_case.rb        |   96 -
 activerecord/lib/active_record/timestamp.rb        |   16 +-
 activerecord/lib/active_record/transactions.rb     |   30 +-
 .../lib/active_record/validations/presence.rb      |    4 +-
 .../lib/active_record/validations/uniqueness.rb    |   36 +-
 activerecord/lib/active_record/version.rb          |   11 +-
 activerecord/lib/rails/generators/active_record.rb |   10 +-
 .../rails/generators/active_record/migration.rb    |   18 +
 .../active_record/migration/migration_generator.rb |    4 +
 .../active_record/model/model_generator.rb         |    4 +
 activerecord/test/cases/adapter_test.rb            |   64 +-
 .../cases/adapters/firebird/connection_test.rb     |    8 -
 .../test/cases/adapters/firebird/default_test.rb   |   16 -
 .../test/cases/adapters/firebird/migration_test.rb |  124 -
 .../test/cases/adapters/mysql/connection_test.rb   |   37 +-
 .../cases/adapters/mysql/mysql_adapter_test.rb     |   14 +-
 .../cases/adapters/mysql/reserved_word_test.rb     |    2 +-
 .../test/cases/adapters/mysql/schema_test.rb       |   38 +
 .../cases/adapters/mysql/statement_pool_test.rb    |   24 +-
 .../test/cases/adapters/mysql2/boolean_test.rb     |   91 +
 .../test/cases/adapters/mysql2/connection_test.rb  |   35 +-
 .../test/cases/adapters/mysql2/explain_test.rb     |    6 +-
 .../cases/adapters/mysql2/reserved_word_test.rb    |    2 +-
 .../adapters/mysql2/schema_migrations_test.rb      |   25 +-
 .../test/cases/adapters/mysql2/schema_test.rb      |    9 +
 .../test/cases/adapters/oracle/synonym_test.rb     |   17 -
 .../adapters/postgresql/active_schema_test.rb      |    6 +-
 .../test/cases/adapters/postgresql/array_test.rb   |  121 +-
 .../test/cases/adapters/postgresql/bytea_test.rb   |    6 +-
 .../cases/adapters/postgresql/composite_test.rb    |   42 +
 .../cases/adapters/postgresql/connection_test.rb   |   56 +-
 .../cases/adapters/postgresql/datatype_test.rb     |  422 +--
 .../postgresql/extension_migration_test.rb         |   65 +
 .../test/cases/adapters/postgresql/hstore_test.rb  |  350 +-
 .../test/cases/adapters/postgresql/json_test.rb    |   37 +-
 .../adapters/postgresql/postgresql_adapter_test.rb |  249 +-
 .../test/cases/adapters/postgresql/quoting_test.rb |   13 +-
 .../test/cases/adapters/postgresql/range_test.rb   |  276 ++
 .../test/cases/adapters/postgresql/schema_test.rb  |   44 +
 .../adapters/postgresql/statement_pool_test.rb     |   56 +-
 .../cases/adapters/postgresql/timestamp_test.rb    |   14 +-
 .../test/cases/adapters/postgresql/uuid_test.rb    |   94 +-
 .../test/cases/adapters/postgresql/xml_test.rb     |    2 +-
 .../test/cases/adapters/sqlite3/copy_table_test.rb |    2 +-
 .../test/cases/adapters/sqlite3/quoting_test.rb    |    7 +
 .../cases/adapters/sqlite3/sqlite3_adapter_test.rb |   72 +-
 .../adapters/sqlite3/sqlite3_create_folder_test.rb |    2 +-
 .../cases/adapters/sqlite3/statement_pool_test.rb  |   23 +-
 .../cases/associations/association_scope_test.rb   |    5 +-
 .../associations/belongs_to_associations_test.rb   |   99 +-
 .../test/cases/associations/callbacks_test.rb      |   21 +
 .../associations/cascaded_eager_loading_test.rb    |   21 +-
 .../associations/eager_singularization_test.rb     |  195 +-
 activerecord/test/cases/associations/eager_test.rb |  115 +-
 .../test/cases/associations/extension_test.rb      |   13 +-
 .../has_and_belongs_to_many_associations_test.rb   |  212 +-
 .../associations/has_many_associations_test.rb     |  496 +--
 .../has_many_through_associations_test.rb          |  232 +-
 .../associations/has_one_associations_test.rb      |   70 +-
 .../has_one_through_associations_test.rb           |   11 +-
 .../associations/inner_join_association_test.rb    |   21 +-
 .../associations/inverse_associations_test.rb      |   98 +-
 .../cases/associations/join_dependency_test.rb     |    8 -
 .../nested_through_associations_test.rb            |   13 +-
 activerecord/test/cases/associations_test.rb       |   15 +-
 .../test/cases/attribute_methods/read_test.rb      |    4 +-
 activerecord/test/cases/attribute_methods_test.rb  |  125 +-
 .../test/cases/autosave_association_test.rb        |  123 +-
 activerecord/test/cases/base_test.rb               |  397 +-
 activerecord/test/cases/batches_test.rb            |   71 +-
 activerecord/test/cases/bind_parameter_test.rb     |   77 +-
 activerecord/test/cases/calculations_test.rb       |   88 +-
 activerecord/test/cases/callbacks_test.rb          |    2 +-
 activerecord/test/cases/column_definition_test.rb  |    4 +-
 activerecord/test/cases/column_test.rb             |    8 +
 .../connection_adapters/connection_handler_test.rb |  193 +
 .../test/cases/connection_management_test.rb       |   34 +-
 activerecord/test/cases/connection_pool_test.rb    |    5 +-
 .../connection_specification/resolver_test.rb      |   95 +-
 activerecord/test/cases/core_test.rb               |   33 +
 activerecord/test/cases/counter_cache_test.rb      |   13 +
 activerecord/test/cases/date_time_test.rb          |    2 +-
 activerecord/test/cases/defaults_test.rb           |   25 +
 .../test/cases/deprecated_dynamic_methods_test.rb  |  592 ---
 activerecord/test/cases/dirty_test.rb              |   64 +-
 activerecord/test/cases/disconnected_test.rb       |   11 +-
 activerecord/test/cases/dup_test.rb                |    2 +-
 activerecord/test/cases/enum_test.rb               |  289 ++
 activerecord/test/cases/finder_respond_to_test.rb  |   45 +-
 activerecord/test/cases/finder_test.rb             |  348 +-
 activerecord/test/cases/fixture_set/file_test.rb   |   55 +
 activerecord/test/cases/fixtures_test.rb           |  104 +-
 .../cases/forbidden_attributes_protection_test.rb  |    5 +
 activerecord/test/cases/helper.rb                  |   93 +-
 activerecord/test/cases/hot_compatibility_test.rb  |    2 +-
 activerecord/test/cases/inheritance_test.rb        |   28 +-
 activerecord/test/cases/integration_test.rb        |  138 +
 activerecord/test/cases/invalid_connection_test.rb |    2 +-
 .../test/cases/invertible_migration_test.rb        |   31 +
 activerecord/test/cases/locking_test.rb            |   19 +-
 activerecord/test/cases/log_subscriber_test.rb     |   24 +-
 .../test/cases/migration/change_schema_test.rb     |   54 +-
 .../test/cases/migration/change_table_test.rb      |    2 +-
 .../test/cases/migration/column_attributes_test.rb |   91 +-
 .../cases/migration/column_positioning_test.rb     |   47 +-
 .../test/cases/migration/command_recorder_test.rb  |   19 +-
 activerecord/test/cases/migration/index_test.rb    |   66 +-
 .../test/cases/migration/references_index_test.rb  |   28 +-
 .../test/cases/migration/rename_table_test.rb      |   48 +-
 activerecord/test/cases/migration_test.rb          |  378 +-
 activerecord/test/cases/migrator_test.rb           |    6 -
 activerecord/test/cases/mixin_test.rb              |   46 +-
 activerecord/test/cases/modules_test.rb            |    1 +
 .../test/cases/multiparameter_attributes_test.rb   |  168 +-
 activerecord/test/cases/multiple_db_test.rb        |    2 +-
 activerecord/test/cases/nested_attributes_test.rb  |   18 -
 .../cases/nested_attributes_with_callbacks_test.rb |  144 +
 activerecord/test/cases/persistence_test.rb        |   74 +-
 activerecord/test/cases/pooled_connections_test.rb |   16 -
 activerecord/test/cases/primary_keys_test.rb       |   51 +-
 activerecord/test/cases/query_cache_test.rb        |   24 +-
 activerecord/test/cases/quoting_test.rb            |   69 +-
 activerecord/test/cases/readonly_test.rb           |   18 +-
 activerecord/test/cases/reaper_test.rb             |    2 +-
 activerecord/test/cases/reflection_test.rb         |   32 +-
 .../test/cases/relation/delegation_test.rb         |   68 +
 activerecord/test/cases/relation/merging_test.rb   |  168 +
 activerecord/test/cases/relation/mutation_test.rb  |  153 +
 .../test/cases/relation/predicate_builder_test.rb  |   14 +
 .../test/cases/relation/where_chain_test.rb        |   36 +
 activerecord/test/cases/relation/where_test.rb     |   71 +
 activerecord/test/cases/relation_test.rb           |  163 +-
 activerecord/test/cases/relations_test.rb          |  361 +-
 activerecord/test/cases/result_test.rb             |   40 +
 activerecord/test/cases/sanitize_test.rb           |    5 +
 activerecord/test/cases/schema_dumper_test.rb      |   25 +-
 .../test/cases/scoping/default_scoping_test.rb     |  100 +-
 .../test/cases/scoping/named_scoping_test.rb       |   90 +-
 activerecord/test/cases/serialization_test.rb      |   19 +
 .../test/cases/serialized_attribute_test.rb        |   42 +-
 activerecord/test/cases/store_test.rb              |   57 +-
 .../test/cases/tasks/database_tasks_test.rb        |   36 +-
 .../test/cases/tasks/firebird_rake_test.rb         |  100 -
 activerecord/test/cases/tasks/mysql_rake_test.rb   |  158 +-
 activerecord/test/cases/tasks/oracle_rake_test.rb  |   93 -
 .../test/cases/tasks/postgresql_rake_test.rb       |    9 +-
 activerecord/test/cases/tasks/sqlite_rake_test.rb  |    6 +-
 .../test/cases/tasks/sqlserver_rake_test.rb        |   87 -
 activerecord/test/cases/test_case.rb               |  117 +-
 activerecord/test/cases/timestamp_test.rb          |  150 +-
 .../test/cases/transaction_callbacks_test.rb       |  180 +-
 .../test/cases/transaction_isolation_test.rb       |  152 +-
 activerecord/test/cases/transactions_test.rb       |  101 +-
 .../validations/association_validation_test.rb     |   54 +-
 .../i18n_generate_message_validation_test.rb       |   26 +-
 .../cases/validations/presence_validation_test.rb  |   16 +
 .../validations/uniqueness_validation_test.rb      |   45 +-
 activerecord/test/cases/validations_test.rb        |   10 +-
 activerecord/test/cases/xml_serialization_test.rb  |   20 +-
 activerecord/test/cases/yaml_serialization_test.rb |   18 +-
 activerecord/test/fixtures/books.yml               |    2 +
 activerecord/test/fixtures/companies.yml           |    8 +
 activerecord/test/fixtures/computers.yml           |    1 +
 activerecord/test/fixtures/owners.yml              |    1 +
 activerecord/test/fixtures/sponsors.yml            |    2 +-
 activerecord/test/fixtures/topics.yml              |    7 +
 .../20131219224947_migration_version_check.rb      |    8 +
 activerecord/test/models/admin/user.rb             |    1 +
 activerecord/test/models/author.rb                 |    7 +-
 activerecord/test/models/auto_id.rb                |    4 +-
 activerecord/test/models/book.rb                   |   13 +-
 activerecord/test/models/bulb.rb                   |   12 +
 activerecord/test/models/car.rb                    |    7 +-
 activerecord/test/models/category.rb               |    1 +
 activerecord/test/models/citation.rb               |    3 -
 activerecord/test/models/club.rb                   |   12 +-
 activerecord/test/models/college.rb                |    5 +
 activerecord/test/models/column.rb                 |    3 +
 activerecord/test/models/column_name.rb            |    4 +-
 activerecord/test/models/comment.rb                |   15 +
 activerecord/test/models/company.rb                |   36 +-
 activerecord/test/models/company_in_module.rb      |    4 -
 activerecord/test/models/contract.rb               |    1 +
 activerecord/test/models/developer.rb              |   16 +-
 activerecord/test/models/electron.rb               |    2 +
 activerecord/test/models/man.rb                    |    1 +
 activerecord/test/models/member.rb                 |    3 +-
 activerecord/test/models/member_detail.rb          |    2 +-
 activerecord/test/models/membership.rb             |    5 +
 activerecord/test/models/mixed_case_monkey.rb      |    2 +-
 activerecord/test/models/molecule.rb               |    2 +
 activerecord/test/models/movie.rb                  |    6 +-
 activerecord/test/models/owner.rb                  |   29 +
 activerecord/test/models/parrot.rb                 |    6 +
 activerecord/test/models/person.rb                 |   13 +
 activerecord/test/models/pirate.rb                 |    1 +
 activerecord/test/models/post.rb                   |   29 +-
 activerecord/test/models/project.rb                |   14 -
 activerecord/test/models/publisher.rb              |    2 +
 activerecord/test/models/publisher/article.rb      |    4 +
 activerecord/test/models/publisher/magazine.rb     |    3 +
 activerecord/test/models/reader.rb                 |    2 +
 activerecord/test/models/record.rb                 |    2 +
 activerecord/test/models/reply.rb                  |    1 +
 activerecord/test/models/shop.rb                   |    5 +
 activerecord/test/models/student.rb                |    1 +
 activerecord/test/models/tag.rb                    |    4 +-
 activerecord/test/models/topic.rb                  |    5 +-
 activerecord/test/models/treasure.rb               |    1 +
 activerecord/test/schema/oracle_specific_schema.rb |    3 -
 .../test/schema/postgresql_specific_schema.rb      |   15 +-
 activerecord/test/schema/schema.rb                 |  469 +--
 activerecord/test/schema/sqlite_specific_schema.rb |    7 +-
 activerecord/test/support/connection.rb            |    4 +-
 activesupport/CHANGELOG.md                         |  830 +++--
 activesupport/MIT-LICENSE                          |    2 +-
 activesupport/README.rdoc                          |    2 +-
 activesupport/Rakefile                             |    5 +-
 activesupport/activesupport.gemspec                |    8 +-
 activesupport/bin/generate_tables                  |    6 -
 activesupport/lib/active_support.rb                |   10 +-
 .../lib/active_support/backtrace_cleaner.rb        |   10 +-
 activesupport/lib/active_support/basic_object.rb   |   11 -
 activesupport/lib/active_support/benchmarkable.rb  |   10 -
 .../lib/active_support/buffered_logger.rb          |   21 -
 activesupport/lib/active_support/cache.rb          |   90 +-
 .../lib/active_support/cache/file_store.rb         |   49 +-
 .../lib/active_support/cache/mem_cache_store.rb    |   14 +-
 .../lib/active_support/cache/memory_store.rb       |    1 +
 .../active_support/cache/strategy/local_cache.rb   |   32 +-
 .../cache/strategy/local_cache_middleware.rb       |   39 +
 activesupport/lib/active_support/callbacks.rb      |  669 ++--
 activesupport/lib/active_support/concern.rb        |   18 +-
 activesupport/lib/active_support/configurable.rb   |    2 +-
 activesupport/lib/active_support/core_ext.rb       |    1 -
 activesupport/lib/active_support/core_ext/array.rb |    1 -
 .../lib/active_support/core_ext/array/access.rb    |    2 +
 .../active_support/core_ext/array/conversions.rb   |   19 +-
 .../lib/active_support/core_ext/array/grouping.rb  |   36 +-
 .../core_ext/array/prepend_and_append.rb           |    4 +-
 .../lib/active_support/core_ext/array/uniq_by.rb   |   19 -
 .../core_ext/big_decimal/conversions.rb            |   15 -
 .../core_ext/big_decimal/yaml_conversions.rb       |   14 +
 activesupport/lib/active_support/core_ext/class.rb |    1 -
 .../lib/active_support/core_ext/class/attribute.rb |   10 +-
 .../core_ext/class/attribute_accessors.rb          |  174 +-
 .../core_ext/class/delegating_attributes.rb        |   17 +-
 .../active_support/core_ext/date/calculations.rb   |   10 +
 .../active_support/core_ext/date/conversions.rb    |   14 +-
 .../lib/active_support/core_ext/date/zones.rb      |   35 +-
 .../core_ext/date_and_time/calculations.rb         |   41 +-
 .../active_support/core_ext/date_and_time/zones.rb |   41 +
 .../core_ext/date_time/calculations.rb             |   35 +-
 .../core_ext/date_time/conversions.rb              |    2 +
 .../lib/active_support/core_ext/date_time/zones.rb |   24 +-
 .../lib/active_support/core_ext/enumerable.rb      |    2 +-
 .../lib/active_support/core_ext/file/atomic.rb     |    2 +-
 activesupport/lib/active_support/core_ext/hash.rb  |    2 +-
 .../lib/active_support/core_ext/hash/compact.rb    |   20 +
 .../active_support/core_ext/hash/conversions.rb    |   11 +-
 .../lib/active_support/core_ext/hash/deep_merge.rb |   33 +-
 .../lib/active_support/core_ext/hash/diff.rb       |   14 -
 .../lib/active_support/core_ext/hash/except.rb     |    2 +-
 .../core_ext/hash/indifferent_access.rb            |    1 +
 .../lib/active_support/core_ext/hash/keys.rb       |   86 +-
 .../lib/active_support/core_ext/hash/slice.rb      |    2 +
 .../active_support/core_ext/integer/multiple.rb    |    6 +-
 .../active_support/core_ext/kernel/reporting.rb    |    5 +-
 .../lib/active_support/core_ext/logger.rb          |   67 -
 .../lib/active_support/core_ext/module.rb          |    1 +
 .../core_ext/module/attr_internal.rb               |    3 +-
 .../core_ext/module/attribute_accessors.rb         |  174 +-
 .../active_support/core_ext/module/concerning.rb   |  135 +
 .../active_support/core_ext/module/delegation.rb   |   58 +-
 .../active_support/core_ext/module/deprecation.rb  |    2 -
 .../core_ext/module/introspection.rb               |   16 -
 .../core_ext/module/method_transplanting.rb        |   11 +
 .../lib/active_support/core_ext/numeric/time.rb    |    8 +
 .../lib/active_support/core_ext/object.rb          |    2 +-
 .../lib/active_support/core_ext/object/blank.rb    |   60 +-
 .../lib/active_support/core_ext/object/deep_dup.rb |   12 +-
 .../active_support/core_ext/object/inclusion.rb    |   31 +-
 .../lib/active_support/core_ext/object/json.rb     |  197 +
 .../lib/active_support/core_ext/object/to_json.rb  |   30 +-
 .../lib/active_support/core_ext/object/to_param.rb |    6 +-
 .../lib/active_support/core_ext/object/to_query.rb |    7 +-
 .../lib/active_support/core_ext/object/try.rb      |    2 +-
 activesupport/lib/active_support/core_ext/proc.rb  |   17 -
 .../lib/active_support/core_ext/range/each.rb      |    3 +-
 .../lib/active_support/core_ext/string/access.rb   |   60 +-
 .../active_support/core_ext/string/conversions.rb  |   17 +-
 .../lib/active_support/core_ext/string/encoding.rb |    8 -
 .../lib/active_support/core_ext/string/exclude.rb  |    6 +-
 .../lib/active_support/core_ext/string/filters.rb  |   16 +-
 .../active_support/core_ext/string/inflections.rb  |   20 +-
 .../core_ext/string/output_safety.rb               |   83 +-
 .../lib/active_support/core_ext/string/zones.rb    |    1 +
 .../lib/active_support/core_ext/thread.rb          |   10 +-
 .../active_support/core_ext/time/calculations.rb   |   77 +-
 .../active_support/core_ext/time/conversions.rb    |    4 +-
 .../lib/active_support/core_ext/time/zones.rb      |   22 +-
 activesupport/lib/active_support/dependencies.rb   |   47 +-
 activesupport/lib/active_support/deprecation.rb    |    8 +-
 .../lib/active_support/deprecation/behaviors.rb    |    6 +-
 activesupport/lib/active_support/duration.rb       |   24 +-
 .../lib/active_support/file_update_checker.rb      |    4 +-
 activesupport/lib/active_support/gem_version.rb    |   15 +
 .../active_support/hash_with_indifferent_access.rb |   19 +-
 activesupport/lib/active_support/i18n.rb           |    8 +-
 activesupport/lib/active_support/i18n_railtie.rb   |   11 +
 activesupport/lib/active_support/inflections.rb    |    7 +-
 .../lib/active_support/inflector/inflections.rb    |   34 +-
 .../lib/active_support/inflector/methods.rb        |   53 +-
 activesupport/lib/active_support/json/decoding.rb  |   35 +-
 activesupport/lib/active_support/json/encoding.rb  |  404 +-
 activesupport/lib/active_support/json/variable.rb  |   18 -
 activesupport/lib/active_support/key_generator.rb  |   18 +-
 .../lib/active_support/lazy_load_hooks.rb          |    2 +-
 .../active_support/log_subscriber/test_helper.rb   |    2 +-
 activesupport/lib/active_support/logger.rb         |    2 +-
 .../lib/active_support/message_encryptor.rb        |    8 +-
 .../lib/active_support/message_verifier.rb         |    7 +-
 .../lib/active_support/multibyte/chars.rb          |    3 +-
 .../lib/active_support/multibyte/unicode.rb        |   99 +-
 activesupport/lib/active_support/notifications.rb  |    6 +-
 .../lib/active_support/notifications/fanout.rb     |   11 +-
 .../active_support/notifications/instrumenter.rb   |    3 +-
 activesupport/lib/active_support/number_helper.rb  |  331 +-
 .../number_helper/number_converter.rb              |  182 +
 .../number_helper/number_to_currency_converter.rb  |   46 +
 .../number_helper/number_to_delimited_converter.rb |   23 +
 .../number_helper/number_to_human_converter.rb     |   66 +
 .../number_to_human_size_converter.rb              |   58 +
 .../number_to_percentage_converter.rb              |   12 +
 .../number_helper/number_to_phone_converter.rb     |   49 +
 .../number_helper/number_to_rounded_converter.rb   |   91 +
 activesupport/lib/active_support/option_merger.rb  |    2 +-
 activesupport/lib/active_support/ordered_hash.rb   |    8 +
 .../lib/active_support/ordered_options.rb          |    8 +
 .../lib/active_support/per_thread_registry.rb      |   17 +-
 activesupport/lib/active_support/subscriber.rb     |   38 +-
 activesupport/lib/active_support/tagged_logging.rb |    1 +
 activesupport/lib/active_support/test_case.rb      |   19 +-
 .../lib/active_support/testing/assertions.rb       |   30 -
 .../lib/active_support/testing/autorun.rb          |    4 +-
 .../lib/active_support/testing/declarative.rb      |   26 +-
 .../lib/active_support/testing/deprecation.rb      |   21 +-
 .../lib/active_support/testing/isolation.rb        |   80 +-
 .../lib/active_support/testing/pending.rb          |   14 -
 .../active_support/testing/setup_and_teardown.rb   |   19 +-
 .../lib/active_support/testing/tagged_logging.rb   |    2 +-
 .../lib/active_support/testing/time_helpers.rb     |  127 +
 activesupport/lib/active_support/time_with_zone.rb |   23 +-
 .../lib/active_support/values/time_zone.rb         |   58 +-
 .../lib/active_support/values/unicode_tables.dat   |  Bin 904483 -> 904640 bytes
 activesupport/lib/active_support/version.rb        |   11 +-
 activesupport/lib/active_support/xml_mini.rb       |    6 +-
 activesupport/test/abstract_unit.rb                |   15 +-
 activesupport/test/caching_test.rb                 |   76 +-
 activesupport/test/callbacks_test.rb               |  316 +-
 activesupport/test/concern_test.rb                 |   24 +-
 activesupport/test/configurable_test.rb            |   14 +
 activesupport/test/constantize_test_cases.rb       |    8 +-
 activesupport/test/core_ext/array_ext_test.rb      |   52 +-
 .../core_ext/big_decimal/yaml_conversions_test.rb  |   11 +
 activesupport/test/core_ext/bigdecimal_test.rb     |   13 -
 activesupport/test/core_ext/blank_test.rb          |   22 +-
 .../test/core_ext/class/attribute_accessor_test.rb |   61 -
 .../core_ext/class/delegating_attributes_test.rb   |    5 +-
 activesupport/test/core_ext/date_ext_test.rb       |   29 +-
 activesupport/test/core_ext/date_time_ext_test.rb  |   10 +
 activesupport/test/core_ext/duration_test.rb       |   44 +-
 activesupport/test/core_ext/enumerable_test.rb     |   25 +-
 activesupport/test/core_ext/hash_ext_test.rb       |  161 +-
 activesupport/test/core_ext/kernel_test.rb         |   16 +
 .../core_ext/module/attribute_accessor_test.rb     |   26 +-
 .../test/core_ext/module/concerning_test.rb        |   35 +
 activesupport/test/core_ext/module_test.rb         |   24 +-
 activesupport/test/core_ext/name_error_test.rb     |   12 +-
 activesupport/test/core_ext/numeric_ext_test.rb    |   53 +-
 .../test/core_ext/object/inclusion_test.rb         |   21 +-
 activesupport/test/core_ext/object/json_test.rb    |    9 +
 .../test/core_ext/object/to_query_test.rb          |   15 +
 .../test/core_ext/object_and_class_ext_test.rb     |   25 -
 activesupport/test/core_ext/proc_test.rb           |   14 -
 activesupport/test/core_ext/range_ext_test.rb      |    6 +-
 activesupport/test/core_ext/string_ext_test.rb     |  163 +-
 activesupport/test/core_ext/thread_test.rb         |   11 -
 activesupport/test/core_ext/time_ext_test.rb       |   77 +-
 activesupport/test/core_ext/time_with_zone_test.rb |   48 +-
 activesupport/test/dependencies_test.rb            |   94 +-
 .../test/deprecation/basic_object_test.rb          |   12 -
 .../test/deprecation/buffered_logger_test.rb       |   22 -
 activesupport/test/deprecation_test.rb             |   11 +-
 ...descendants_tracker_without_autoloading_test.rb |   10 +
 activesupport/test/empty_bool.rb                   |    7 -
 activesupport/test/fixtures/custom.rb              |    2 -
 activesupport/test/inflector_test.rb               |   73 +-
 activesupport/test/inflector_test_cases.rb         |    8 +-
 activesupport/test/json/decoding_test.rb           |   62 +-
 activesupport/test/json/encoding_test.rb           |  263 +-
 activesupport/test/load_paths_test.rb              |    4 +-
 activesupport/test/message_encryptor_test.rb       |   15 +-
 activesupport/test/message_verifier_test.rb        |   24 +-
 activesupport/test/multibyte_chars_test.rb         |    6 +-
 activesupport/test/notifications_test.rb           |    2 +-
 activesupport/test/number_helper_test.rb           |   26 +-
 activesupport/test/ordered_hash_test.rb            |    7 +-
 activesupport/test/safe_buffer_test.rb             |   25 +
 activesupport/test/subscriber_test.rb              |   54 +
 activesupport/test/test_case_test.rb               |  121 -
 activesupport/test/test_test.rb                    |  124 +-
 activesupport/test/testing/constant_lookup_test.rb |    1 -
 activesupport/test/time_zone_test.rb               |   59 +-
 activesupport/test/transliterate_test.rb           |    6 +-
 .../test/xml_mini/nokogirisax_engine_test.rb       |    6 +-
 activesupport/test/xml_mini_test.rb                |  136 +-
 ci/travis.rb                                       |    3 +-
 .../events/_event.html.erb => guides/.document     |    0
 guides/CHANGELOG.md                                |   41 +
 guides/Rakefile                                    |   77 +
 guides/assets/images/akshaysurve.jpg               |  Bin 0 -> 3444 bytes
 guides/assets/images/belongs_to.png                |  Bin 0 -> 26076 bytes
 guides/assets/images/book_icon.gif                 |  Bin 0 -> 329 bytes
 guides/assets/images/bullet.gif                    |  Bin 0 -> 60 bytes
 guides/assets/images/chapters_icon.gif             |  Bin 0 -> 620 bytes
 guides/assets/images/check_bullet.gif              |  Bin 0 -> 376 bytes
 guides/assets/images/credits_pic_blank.gif         |  Bin 0 -> 597 bytes
 guides/assets/images/csrf.png                      |  Bin 0 -> 32179 bytes
 guides/assets/images/edge_badge.png                |  Bin 0 -> 5695 bytes
 guides/assets/images/favicon.ico                   |  Bin 0 -> 1150 bytes
 guides/assets/images/feature_tile.gif              |  Bin 0 -> 35 bytes
 guides/assets/images/footer_tile.gif               |  Bin 0 -> 36 bytes
 guides/assets/images/fxn.png                       |  Bin 0 -> 15436 bytes
 .../getting_started/article_with_comments.png      |  Bin 0 -> 15190 bytes
 guides/assets/images/getting_started/challenge.png |  Bin 0 -> 21690 bytes
 .../images/getting_started/confirm_dialog.png      |  Bin 0 -> 18809 bytes
 .../forbidden_attributes_for_new_article.png       |  Bin 0 -> 10783 bytes
 .../images/getting_started/form_with_errors.png    |  Bin 0 -> 12447 bytes
 .../index_action_with_edit_link.png                |  Bin 0 -> 10209 bytes
 .../assets/images/getting_started/new_article.png  |  Bin 0 -> 3579 bytes
 .../images/getting_started/rails_welcome.png       |  Bin 0 -> 94542 bytes
 .../routing_error_no_controller.png                |  Bin 0 -> 4186 bytes
 .../routing_error_no_route_matches.png             |  Bin 0 -> 5913 bytes
 .../getting_started/show_action_for_articles.png   |  Bin 0 -> 2965 bytes
 .../template_is_missing_articles_new.png           |  Bin 0 -> 6174 bytes
 .../unknown_action_create_for_articles.png         |  Bin 0 -> 5327 bytes
 .../unknown_action_new_for_articles.png            |  Bin 0 -> 5481 bytes
 guides/assets/images/grey_bullet.gif               |  Bin 0 -> 37 bytes
 guides/assets/images/habtm.png                     |  Bin 0 -> 49332 bytes
 guides/assets/images/has_many.png                  |  Bin 0 -> 28988 bytes
 guides/assets/images/has_many_through.png          |  Bin 0 -> 79428 bytes
 guides/assets/images/has_one.png                   |  Bin 0 -> 29072 bytes
 guides/assets/images/has_one_through.png           |  Bin 0 -> 72434 bytes
 guides/assets/images/header_backdrop.png           |  Bin 0 -> 224 bytes
 guides/assets/images/header_tile.gif               |  Bin 0 -> 36 bytes
 guides/assets/images/i18n/demo_html_safe.png       |  Bin 0 -> 10073 bytes
 .../assets/images/i18n/demo_localized_pirate.png   |  Bin 0 -> 11485 bytes
 guides/assets/images/i18n/demo_translated_en.png   |  Bin 0 -> 9325 bytes
 .../assets/images/i18n/demo_translated_pirate.png  |  Bin 0 -> 10202 bytes
 .../images/i18n/demo_translation_missing.png       |  Bin 0 -> 10260 bytes
 guides/assets/images/i18n/demo_untranslated.png    |  Bin 0 -> 9224 bytes
 guides/assets/images/icons/README                  |    5 +
 guides/assets/images/icons/callouts/1.png          |  Bin 0 -> 147 bytes
 guides/assets/images/icons/callouts/10.png         |  Bin 0 -> 183 bytes
 guides/assets/images/icons/callouts/11.png         |  Bin 0 -> 176 bytes
 guides/assets/images/icons/callouts/12.png         |  Bin 0 -> 186 bytes
 guides/assets/images/icons/callouts/13.png         |  Bin 0 -> 188 bytes
 guides/assets/images/icons/callouts/14.png         |  Bin 0 -> 246 bytes
 guides/assets/images/icons/callouts/15.png         |  Bin 0 -> 191 bytes
 guides/assets/images/icons/callouts/2.png          |  Bin 0 -> 168 bytes
 guides/assets/images/icons/callouts/3.png          |  Bin 0 -> 170 bytes
 guides/assets/images/icons/callouts/4.png          |  Bin 0 -> 165 bytes
 guides/assets/images/icons/callouts/5.png          |  Bin 0 -> 169 bytes
 guides/assets/images/icons/callouts/6.png          |  Bin 0 -> 176 bytes
 guides/assets/images/icons/callouts/7.png          |  Bin 0 -> 160 bytes
 guides/assets/images/icons/callouts/8.png          |  Bin 0 -> 176 bytes
 guides/assets/images/icons/callouts/9.png          |  Bin 0 -> 177 bytes
 guides/assets/images/icons/caution.png             |  Bin 0 -> 2295 bytes
 guides/assets/images/icons/example.png             |  Bin 0 -> 2078 bytes
 guides/assets/images/icons/home.png                |  Bin 0 -> 1163 bytes
 guides/assets/images/icons/important.png           |  Bin 0 -> 2451 bytes
 guides/assets/images/icons/next.png                |  Bin 0 -> 1146 bytes
 guides/assets/images/icons/note.png                |  Bin 0 -> 2155 bytes
 guides/assets/images/icons/prev.png                |  Bin 0 -> 1126 bytes
 guides/assets/images/icons/tip.png                 |  Bin 0 -> 2248 bytes
 guides/assets/images/icons/up.png                  |  Bin 0 -> 1133 bytes
 guides/assets/images/icons/warning.png             |  Bin 0 -> 2616 bytes
 guides/assets/images/nav_arrow.gif                 |  Bin 0 -> 419 bytes
 guides/assets/images/oscardelben.jpg               |  Bin 0 -> 6299 bytes
 guides/assets/images/polymorphic.png               |  Bin 0 -> 66415 bytes
 guides/assets/images/radar.png                     |  Bin 0 -> 17095 bytes
 guides/assets/images/rails4_features.png           |  Bin 0 -> 67766 bytes
 guides/assets/images/rails_guides_kindle_cover.jpg |  Bin 0 -> 20955 bytes
 guides/assets/images/rails_guides_logo.gif         |  Bin 0 -> 5106 bytes
 guides/assets/images/rails_logo_remix.gif          |  Bin 0 -> 8533 bytes
 guides/assets/images/session_fixation.png          |  Bin 0 -> 38451 bytes
 guides/assets/images/tab_grey.gif                  |  Bin 0 -> 4684 bytes
 guides/assets/images/tab_info.gif                  |  Bin 0 -> 4522 bytes
 guides/assets/images/tab_note.gif                  |  Bin 0 -> 4566 bytes
 guides/assets/images/tab_red.gif                   |  Bin 0 -> 4507 bytes
 guides/assets/images/tab_yellow.gif                |  Bin 0 -> 4519 bytes
 guides/assets/images/tab_yellow.png                |  Bin 0 -> 1441 bytes
 guides/assets/images/vijaydev.jpg                  |  Bin 0 -> 2897 bytes
 guides/assets/javascripts/guides.js                |   53 +
 guides/assets/javascripts/jquery.min.js            |    4 +
 guides/assets/javascripts/responsive-tables.js     |   43 +
 .../javascripts/syntaxhighlighter/shBrushAS3.js    |   59 +
 .../syntaxhighlighter/shBrushAppleScript.js        |   75 +
 .../javascripts/syntaxhighlighter/shBrushBash.js   |   59 +
 .../javascripts/syntaxhighlighter/shBrushCSharp.js |   65 +
 .../syntaxhighlighter/shBrushColdFusion.js         |  100 +
 .../javascripts/syntaxhighlighter/shBrushCpp.js    |   97 +
 .../javascripts/syntaxhighlighter/shBrushCss.js    |   91 +
 .../javascripts/syntaxhighlighter/shBrushDelphi.js |   55 +
 .../javascripts/syntaxhighlighter/shBrushDiff.js   |   41 +
 .../javascripts/syntaxhighlighter/shBrushErlang.js |   52 +
 .../javascripts/syntaxhighlighter/shBrushGroovy.js |   67 +
 .../syntaxhighlighter/shBrushJScript.js            |   52 +
 .../javascripts/syntaxhighlighter/shBrushJava.js   |   57 +
 .../javascripts/syntaxhighlighter/shBrushJavaFX.js |   58 +
 .../javascripts/syntaxhighlighter/shBrushPerl.js   |   72 +
 .../javascripts/syntaxhighlighter/shBrushPhp.js    |   88 +
 .../javascripts/syntaxhighlighter/shBrushPlain.js  |   33 +
 .../syntaxhighlighter/shBrushPowerShell.js         |   74 +
 .../javascripts/syntaxhighlighter/shBrushPython.js |   64 +
 .../javascripts/syntaxhighlighter/shBrushRuby.js   |   55 +
 .../javascripts/syntaxhighlighter/shBrushSass.js   |   94 +
 .../javascripts/syntaxhighlighter/shBrushScala.js  |   51 +
 .../javascripts/syntaxhighlighter/shBrushSql.js    |   66 +
 .../javascripts/syntaxhighlighter/shBrushVb.js     |   56 +
 .../javascripts/syntaxhighlighter/shBrushXml.js    |   69 +
 .../assets/javascripts/syntaxhighlighter/shCore.js |   17 +
 guides/assets/stylesheets/fixes.css                |   16 +
 guides/assets/stylesheets/kindle.css               |   11 +
 guides/assets/stylesheets/main.css                 |  710 ++++
 guides/assets/stylesheets/print.css                |   52 +
 guides/assets/stylesheets/reset.css                |   43 +
 guides/assets/stylesheets/responsive-tables.css    |   50 +
 guides/assets/stylesheets/style.css                |   13 +
 .../stylesheets/syntaxhighlighter/shCore.css       |  226 ++
 .../syntaxhighlighter/shCoreDefault.css            |  328 ++
 .../stylesheets/syntaxhighlighter/shCoreDjango.css |  331 ++
 .../syntaxhighlighter/shCoreEclipse.css            |  339 ++
 .../stylesheets/syntaxhighlighter/shCoreEmacs.css  |  324 ++
 .../syntaxhighlighter/shCoreFadeToGrey.css         |  328 ++
 .../syntaxhighlighter/shCoreMDUltra.css            |  324 ++
 .../syntaxhighlighter/shCoreMidnight.css           |  324 ++
 .../stylesheets/syntaxhighlighter/shCoreRDark.css  |  324 ++
 .../syntaxhighlighter/shThemeDefault.css           |  117 +
 .../syntaxhighlighter/shThemeDjango.css            |  120 +
 .../syntaxhighlighter/shThemeEclipse.css           |  128 +
 .../stylesheets/syntaxhighlighter/shThemeEmacs.css |  113 +
 .../syntaxhighlighter/shThemeFadeToGrey.css        |  117 +
 .../syntaxhighlighter/shThemeMDUltra.css           |  113 +
 .../syntaxhighlighter/shThemeMidnight.css          |  113 +
 .../stylesheets/syntaxhighlighter/shThemeRDark.css |  113 +
 .../syntaxhighlighter/shThemeRailsGuides.css       |  116 +
 .../bug_report_templates/action_controller_gem.rb  |   47 +
 .../action_controller_master.rb                    |   53 +
 guides/bug_report_templates/active_record_gem.rb   |   40 +
 .../bug_report_templates/active_record_master.rb   |   49 +
 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         |    0
 .../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 +
 .../code/getting_started/app/mailers/.keep         |    0
 .../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 +
 .../code/getting_started/config/database.yml       |    0
 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              |    0
 .../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 +
 .../code/getting_started/lib/assets/.keep          |    0
 .../code/getting_started/lib/tasks/.keep           |    0
 .../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 +
 .../code/getting_started/public/favicon.ico        |    0
 guides/code/getting_started/public/robots.txt      |    5 +
 .../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 +
 .../code/getting_started/test/fixtures/.keep       |    0
 .../getting_started/test/fixtures/comments.yml     |   11 +
 .../code/getting_started/test/fixtures/posts.yml   |    9 +
 .../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 +
 .../code/getting_started/test/integration/.keep    |    0
 .../code/getting_started/test/mailers/.keep        |    0
 .../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                             |   63 +
 guides/rails_guides/generator.rb                   |  248 ++
 guides/rails_guides/helpers.rb                     |   53 +
 guides/rails_guides/indexer.rb                     |   68 +
 guides/rails_guides/kindle.rb                      |  119 +
 guides/rails_guides/levenshtein.rb                 |   31 +
 guides/rails_guides/markdown.rb                    |  163 +
 guides/rails_guides/markdown/renderer.rb           |   82 +
 guides/source/2_2_release_notes.md                 |  435 +++
 guides/source/2_3_release_notes.md                 |  621 ++++
 guides/source/3_0_release_notes.md                 |  611 ++++
 guides/source/3_1_release_notes.md                 |  556 +++
 guides/source/3_2_release_notes.md                 |  565 +++
 guides/source/4_0_release_notes.md                 |  276 ++
 guides/source/4_1_release_notes.md                 |  731 ++++
 guides/source/_license.html.erb                    |    2 +
 guides/source/_welcome.html.erb                    |   25 +
 guides/source/action_controller_overview.md        | 1175 ++++++
 guides/source/action_mailer_basics.md              |  689 ++++
 guides/source/action_view_overview.md              | 1610 ++++++++
 guides/source/active_model_basics.md               |  200 +
 guides/source/active_record_basics.md              |  373 ++
 guides/source/active_record_callbacks.md           |  410 +++
 guides/source/active_record_querying.md            | 1773 +++++++++
 guides/source/active_record_validations.md         | 1169 ++++++
 guides/source/active_support_core_extensions.md    | 3864 ++++++++++++++++++++
 guides/source/active_support_instrumentation.md    |  496 +++
 guides/source/api_documentation_guidelines.md      |  315 ++
 guides/source/asset_pipeline.md                    | 1163 ++++++
 guides/source/association_basics.md                | 2229 +++++++++++
 guides/source/caching_with_rails.md                |  354 ++
 guides/source/command_line.md                      |  603 +++
 guides/source/configuring.md                       |  942 +++++
 guides/source/contributing_to_ruby_on_rails.md     |  544 +++
 guides/source/credits.html.erb                     |   80 +
 guides/source/debugging_rails_applications.md      |  707 ++++
 guides/source/development_dependencies_install.md  |  278 ++
 guides/source/documents.yaml                       |  193 +
 guides/source/engines.md                           | 1391 +++++++
 guides/source/form_helpers.md                      | 1001 +++++
 guides/source/generators.md                        |  663 ++++
 guides/source/getting_started.md                   | 1947 ++++++++++
 guides/source/i18n.md                              | 1043 ++++++
 guides/source/index.html.erb                       |   27 +
 guides/source/initialization.md                    |  657 ++++
 guides/source/kindle/copyright.html.erb            |    1 +
 guides/source/kindle/layout.html.erb               |   27 +
 guides/source/kindle/rails_guides.opf.erb          |   52 +
 guides/source/kindle/toc.html.erb                  |   24 +
 guides/source/kindle/toc.ncx.erb                   |   64 +
 guides/source/kindle/welcome.html.erb              |    5 +
 guides/source/layout.html.erb                      |  146 +
 guides/source/layouts_and_rendering.md             | 1226 +++++++
 guides/source/maintenance_policy.md                |   56 +
 guides/source/migrations.md                        | 1109 ++++++
 guides/source/nested_model_forms.md                |  225 ++
 guides/source/plugins.md                           |  444 +++
 guides/source/rails_application_templates.md       |  248 ++
 guides/source/rails_on_rack.md                     |  333 ++
 guides/source/routing.md                           | 1115 ++++++
 guides/source/ruby_on_rails_guides_guidelines.md   |  128 +
 guides/source/security.md                          | 1018 ++++++
 guides/source/testing.md                           | 1052 ++++++
 guides/source/upgrading_ruby_on_rails.md           |  899 +++++
 guides/source/working_with_javascript_in_rails.md  |  405 ++
 guides/w3c_validator.rb                            |   95 +
 install.rb                                         |    2 +-
 rails.gemspec                                      |    4 +-
 railties/CHANGELOG.md                              |  470 ++-
 railties/MIT-LICENSE                               |    2 +-
 railties/README.rdoc                               |    2 +-
 railties/Rakefile                                  |   15 +-
 railties/bin/rails                                 |    4 +-
 railties/lib/rails.rb                              |   28 +-
 railties/lib/rails/all.rb                          |    1 +
 railties/lib/rails/api/task.rb                     |   21 +-
 railties/lib/rails/app_rails_loader.rb             |    6 +-
 railties/lib/rails/application.rb                  |  326 +-
 railties/lib/rails/application/configuration.rb    |   34 +-
 .../rails/application/default_middleware_stack.rb  |   99 +
 railties/lib/rails/application/finisher.rb         |    2 +
 railties/lib/rails/application_controller.rb       |   16 +
 railties/lib/rails/cli.rb                          |    3 +-
 railties/lib/rails/commands.rb                     |   96 +-
 railties/lib/rails/commands/application.rb         |   30 +-
 railties/lib/rails/commands/commands_tasks.rb      |  174 +
 railties/lib/rails/commands/console.rb             |    4 +-
 railties/lib/rails/commands/dbconsole.rb           |   19 +-
 railties/lib/rails/commands/plugin.rb              |   23 +
 railties/lib/rails/commands/plugin_new.rb          |    9 -
 railties/lib/rails/commands/runner.rb              |   23 +-
 railties/lib/rails/commands/server.rb              |   76 +-
 railties/lib/rails/configuration.rb                |    5 +-
 railties/lib/rails/console/helpers.rb              |    6 +
 railties/lib/rails/engine.rb                       |   43 +-
 railties/lib/rails/engine/commands.rb              |    2 +-
 railties/lib/rails/engine/railties.rb              |    8 -
 railties/lib/rails/gem_version.rb                  |   15 +
 railties/lib/rails/generators.rb                   |    7 +-
 railties/lib/rails/generators/actions.rb           |   18 +-
 .../rails/generators/actions/create_migration.rb   |   68 +
 railties/lib/rails/generators/active_model.rb      |    8 -
 railties/lib/rails/generators/app_base.rb          |  225 +-
 railties/lib/rails/generators/base.rb              |   41 +-
 railties/lib/rails/generators/erb.rb               |    6 +-
 .../erb/controller/controller_generator.rb         |    6 +-
 .../generators/erb/mailer/mailer_generator.rb      |    4 +-
 .../generators/erb/mailer/templates/view.html.erb  |    5 +
 .../generators/erb/mailer/templates/view.text.erb  |    2 +-
 .../generators/erb/scaffold/scaffold_generator.rb  |    6 +-
 .../erb/scaffold/templates/_form.html.erb          |    4 +-
 .../erb/scaffold/templates/index.html.erb          |    4 +-
 railties/lib/rails/generators/migration.rb         |   45 +-
 railties/lib/rails/generators/named_base.rb        |   11 +-
 .../rails/generators/rails/app/app_generator.rb    |  113 +-
 .../rails/generators/rails/app/templates/Gemfile   |   33 +-
 .../rails/generators/rails/app/templates/Rakefile  |    2 +-
 .../app/assets/javascripts/application.js.tt       |    2 +
 .../app/assets/stylesheets/application.css         |    8 +-
 .../app/views/layouts/application.html.erb.tt      |   12 +-
 .../rails/app/templates/config/application.rb      |    9 +-
 .../generators/rails/app/templates/config/boot.rb  |    2 +-
 .../app/templates/config/databases/frontbase.yml   |   36 +-
 .../app/templates/config/databases/ibm_db.yml      |   65 +-
 .../rails/app/templates/config/databases/jdbc.yml  |   64 +-
 .../app/templates/config/databases/jdbcmysql.yml   |   39 +-
 .../templates/config/databases/jdbcpostgresql.yml  |   47 +-
 .../app/templates/config/databases/jdbcsqlite3.yml |    9 +-
 .../rails/app/templates/config/databases/mysql.yml |   53 +-
 .../app/templates/config/databases/oracle.yml      |   35 +-
 .../app/templates/config/databases/postgresql.yml  |   51 +-
 .../app/templates/config/databases/sqlite3.yml     |   16 +-
 .../app/templates/config/databases/sqlserver.yml   |   43 +-
 .../rails/app/templates/config/environment.rb      |    2 +-
 .../config/environments/development.rb.tt          |   14 +-
 .../templates/config/environments/production.rb.tt |   14 +-
 .../app/templates/config/environments/test.rb.tt   |    7 +-
 .../app/templates/config/initializers/assets.rb.tt |    8 +
 .../config/initializers/cookies_serializer.rb      |    3 +
 .../templates/config/initializers/mime_types.rb    |    1 -
 .../config/initializers/secret_token.rb.tt         |   12 -
 .../config/initializers/session_store.rb.tt        |    2 +-
 .../rails/app/templates/config/routes.rb           |    2 +-
 .../rails/app/templates/config/secrets.yml         |   22 +
 .../generators/rails/app/templates/public/404.html |   31 +-
 .../generators/rails/app/templates/public/422.html |   31 +-
 .../generators/rails/app/templates/public/500.html |   29 +-
 .../rails/app/templates/public/robots.txt          |    2 +-
 .../rails/app/templates/test/test_helper.rb        |    7 +-
 .../lib/rails/generators/rails/controller/USAGE    |    1 +
 .../rails/controller/controller_generator.rb       |   36 +-
 .../lib/rails/generators/rails/generator/USAGE     |    1 +
 .../rails/generator/generator_generator.rb         |    2 +
 railties/lib/rails/generators/rails/model/USAGE    |   12 +-
 .../generators/rails/{plugin_new => plugin}/USAGE  |    0
 .../generators/rails/plugin/plugin_generator.rb    |  371 ++
 .../rails/plugin/templates/%name%.gemspec          |   27 +
 .../generators/rails/plugin/templates/Gemfile      |   43 +
 .../{plugin_new => plugin}/templates/MIT-LICENSE   |    0
 .../{plugin_new => plugin}/templates/README.rdoc   |    0
 .../{plugin_new => plugin}/templates/Rakefile      |    0
 .../%name%/application_controller.rb.tt            |    0
 .../app/helpers/%name%/application_helper.rb.tt    |    0
 .../templates/app/mailers/.empty_directory         |    0
 .../templates/app/models}/.empty_directory         |    0
 .../views/layouts/%name%/application.html.erb.tt   |    0
 .../generators/rails/plugin/templates/bin/rails.tt |   11 +
 .../templates/config/routes.rb                     |    0
 .../{plugin_new => plugin}/templates/gitignore     |    0
 .../{plugin_new => plugin}/templates/lib/%name%.rb |    0
 .../templates/lib/%name%/engine.rb                 |    0
 .../templates/lib/%name%/version.rb                |    0
 .../templates/lib/tasks/%name%_tasks.rake          |    0
 .../rails/plugin/templates/rails/application.rb    |   18 +
 .../rails/plugin/templates/rails/boot.rb           |    5 +
 .../templates/rails/javascripts.js                 |    0
 .../templates/rails/routes.rb                      |    0
 .../rails/plugin/templates/rails/stylesheets.css   |   15 +
 .../templates/test/%name%_test.rb                  |    0
 .../templates/test/integration/navigation_test.rb  |    0
 .../templates/test/test_helper.rb                  |    0
 .../rails/plugin_new/plugin_new_generator.rb       |  368 --
 .../rails/plugin_new/templates/%name%.gemspec      |   26 -
 .../generators/rails/plugin_new/templates/Gemfile  |   30 -
 .../rails/plugin_new/templates/bin/rails.tt        |    7 -
 .../plugin_new/templates/rails/application.rb      |   17 -
 .../rails/plugin_new/templates/rails/boot.rb       |    5 -
 .../plugin_new/templates/rails/stylesheets.css     |   13 -
 .../resource_route/resource_route_generator.rb     |    2 +-
 .../scaffold_controller_generator.rb               |    2 +-
 .../scaffold_controller/templates/controller.rb    |    8 +-
 railties/lib/rails/generators/resource_helpers.rb  |   23 +-
 .../test_unit/generator/generator_generator.rb     |   26 +
 .../generator/templates/generator_test.rb          |   16 +
 .../test_unit/mailer/mailer_generator.rb           |    9 +-
 .../test_unit/mailer/templates/preview.rb          |   13 +
 .../lib/rails/generators/testing/assertions.rb     |    6 +-
 railties/lib/rails/info.rb                         |    8 +-
 railties/lib/rails/info_controller.rb              |   20 +-
 railties/lib/rails/mailers_controller.rb           |   73 +
 railties/lib/rails/paths.rb                        |   35 +-
 railties/lib/rails/rack/debugger.rb                |    4 +-
 railties/lib/rails/rack/log_tailer.rb              |    2 +-
 railties/lib/rails/rack/logger.rb                  |    2 +-
 railties/lib/rails/railtie.rb                      |   64 +-
 railties/lib/rails/railtie/configuration.rb        |    2 +-
 railties/lib/rails/source_annotation_extractor.rb  |    4 +-
 railties/lib/rails/tasks.rb                        |    2 -
 railties/lib/rails/tasks/documentation.rake        |    5 -
 railties/lib/rails/tasks/engine.rake               |    2 +-
 railties/lib/rails/tasks/framework.rake            |   18 +-
 railties/lib/rails/tasks/log.rake                  |    2 +-
 .../rails/templates/layouts/application.html.erb   |    4 +-
 .../rails/templates/rails/mailers/email.html.erb   |   98 +
 .../rails/templates/rails/mailers/index.html.erb   |    8 +
 .../rails/templates/rails/mailers/mailer.html.erb  |    6 +
 railties/lib/rails/test_help.rb                    |    8 +-
 railties/lib/rails/test_unit/sub_test_task.rb      |   47 +-
 railties/lib/rails/test_unit/testing.rake          |  121 +-
 railties/lib/rails/version.rb                      |   12 +-
 railties/lib/rails/welcome_controller.rb           |    7 +-
 railties/railties.gemspec                          |    2 +
 railties/test/abstract_unit.rb                     |   12 +-
 railties/test/app_rails_loader_test.rb             |   10 +-
 railties/test/application/asset_debugging_test.rb  |    2 +-
 railties/test/application/assets_test.rb           |   66 +-
 railties/test/application/configuration_test.rb    |  220 +-
 .../application/initializers/frameworks_test.rb    |   12 +-
 .../test/application/initializers/i18n_test.rb     |   49 +-
 .../application/initializers/load_path_test.rb     |   20 +-
 .../application/initializers/notifications_test.rb |   13 +
 railties/test/application/loading_test.rb          |   26 +-
 railties/test/application/mailer_previews_test.rb  |  428 +++
 railties/test/application/middleware/cache_test.rb |    2 +-
 .../test/application/middleware/session_test.rb    |   14 +-
 railties/test/application/middleware_test.rb       |   24 +-
 .../test/application/multiple_applications_test.rb |  174 +
 railties/test/application/rake/dbs_test.rb         |   34 +-
 railties/test/application/rake/migrations_test.rb  |   31 +
 railties/test/application/rake/notes_test.rb       |    8 +-
 railties/test/application/rake_test.rb             |   80 +-
 railties/test/application/rendering_test.rb        |    2 +-
 railties/test/application/routing_test.rb          |   30 +-
 railties/test/application/test_runner_test.rb      |   20 +-
 railties/test/application/test_test.rb             |   84 +-
 railties/test/application/url_generation_test.rb   |    3 +-
 railties/test/commands/dbconsole_test.rb           |   96 +-
 railties/test/commands/server_test.rb              |   58 +-
 .../configuration/middleware_stack_proxy_test.rb   |    4 +-
 railties/test/env_helpers.rb                       |    4 +
 railties/test/generators/actions_test.rb           |    2 +-
 railties/test/generators/app_generator_test.rb     |  158 +-
 railties/test/generators/argv_scrubber_test.rb     |  136 +
 .../test/generators/controller_generator_test.rb   |   13 +-
 railties/test/generators/create_migration_test.rb  |  134 +
 .../test/generators/generator_generator_test.rb    |   12 +
 railties/test/generators/generator_test.rb         |   85 +
 railties/test/generators/generators_test_helper.rb |    9 +-
 railties/test/generators/mailer_generator_test.rb  |   61 +-
 railties/test/generators/named_base_test.rb        |   19 +
 .../test/generators/namespaced_generators_test.rb  |    4 +-
 railties/test/generators/plugin_generator_test.rb  |  375 ++
 .../test/generators/plugin_new_generator_test.rb   |  350 --
 .../scaffold_controller_generator_test.rb          |   10 +-
 railties/test/generators/shared_generator_tests.rb |   28 +-
 railties/test/generators/task_generator_test.rb    |   14 +-
 railties/test/generators_test.rb                   |    6 +-
 railties/test/initializable_test.rb                |   10 +-
 railties/test/isolation/abstract_unit.rb           |   33 +-
 railties/test/paths_test.rb                        |    4 +-
 railties/test/rack_logger_test.rb                  |    8 +-
 railties/test/rails_info_test.rb                   |    5 +
 railties/test/railties/engine_test.rb              |   35 +-
 railties/test/railties/mounted_engine_test.rb      |    2 +-
 railties/test/railties/railtie_test.rb             |   33 +-
 railties/test/test_info_test.rb                    |    1 +
 railties/test/version_test.rb                      |   12 +
 tasks/release.rb                                   |   54 +-
 version.rb                                         |    9 +-
 1910 files changed, 110907 insertions(+), 50151 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