This project is archived and is in readonly mode.

Changeset [906aebceedb95d8caa6db6314bc90f605bdfaf2b] by Carl Lerche & Yehuda Katz

Revision 906aebceedb95d8caa6db6314bc90f605bdfaf2b, committed by Carl Lerche & Yehuda Katz · April 13th, 2009 @ 11:18 PM

Bring abstract_controller up to date with rails/master

Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list of commits that could not be applied cleanly or are obviated with the abstract_controller refactor. They all need to be revisited to ensure that fixes made in 2.3 do not reappear in 3.0:

2259ecf368e6a6715966f69216e3ee86bf1a82a7 AR not available * This will be reimplemented with ActionORM or equivalent

06182ea02e92afad579998aa80144588e8865ac3 implicitly rendering a js response should not use the default layout [#1844 state:resolved] * This will be handled generically

893e9eb99504705419ad6edac14d00e71cef5f12 Improve view rendering performance in development mode and reinstate template recompiling in production [#1909 state:resolved] * We will need to reimplement rails-dev-boost on top of the refactor;

the changes here are very implementation specific and cannot be
cleanly applied. The following commits are implicated:

  199e750d46c04970b5e7684998d09405648ecbd4
  3942cb406e1d5db0ac00e03153809cc8dc4cc4db
  f8ea9f85d4f1e3e6f3b5d895bef6b013aa4b0690
  e3b166aab37ddc2fbab030b146eb61713b91bf55
  ae9f258e03c9fd5088da12c1c6cd216cc89a01f7
  44423126c6f6133a1d9cf1d0832b527e8711d40f

0cb020b4d6d838025859bd60fb8151c8e21b8e84 workaround for picking layouts based on wrong view_paths [#1974 state:resolved] * The specifics of this commit no longer apply. Since it is a two-line

commit, we will reimplement this change.

8c5cc66a831aadb159f3daaffa4208064c30af0e make action_controller/layouts pick templates from the current instance's view_paths instead of the class view_paths [#1974 state:resolved] * This does not apply at all. It should be trivial to apply the feature

to the reimplemented ActionController::Base.

87e8b162463f13bd50d27398f020769460a770e3 fix HTML fallback for explicit templates [#2052 state:resolved] * There were a number of patches related to this that simply compounded

each other. Basically none of them apply cleanly, and the underlying
issue needs to be revisited. After discussing the underlying problem
with Koz, we will defer these fixes for further discussion.

http://github.com/rails/rails/co...

683 changed files

M .gitignore
M actionmailer/CHANGELOG
M actionmailer/Rakefile
M actionmailer/lib/action_mailer.rb
M actionmailer/lib/action_mailer/base.rb
M actionmailer/lib/action_mailer/part.rb
M actionmailer/lib/action_mailer/vendor/text-format-0.6.3/text/format.rb
M actionmailer/lib/action_mailer/version.rb
M actionmailer/test/abstract_unit.rb
M actionmailer/test/mail_layout_test.rb
M actionmailer/test/mail_service_test.rb
M actionmailer/test/test_helper_test.rb
M actionpack/CHANGELOG
M actionpack/Rakefile
M actionpack/lib/action_controller.rb
M actionpack/lib/action_controller/base/base.rb
M actionpack/lib/action_controller/base/cookies.rb
M actionpack/lib/action_controller/base/http_authentication.rb
M actionpack/lib/action_controller/base/redirect.rb
M actionpack/lib/action_controller/base/render.rb
M actionpack/lib/action_controller/base/responder.rb
M actionpack/lib/action_controller/base/streaming.rb
M actionpack/lib/action_controller/base/verification.rb
M actionpack/lib/action_controller/caching.rb
M actionpack/lib/action_controller/caching/actions.rb
M actionpack/lib/action_controller/cgi/process.rb
M actionpack/lib/action_controller/dispatch/dispatcher.rb
M actionpack/lib/action_controller/dispatch/middlewares.rb
M actionpack/lib/action_controller/dispatch/rescue.rb
M actionpack/lib/action_controller/reloader.rb
M actionpack/lib/action_controller/routing.rb
M actionpack/lib/action_controller/routing/builder.rb
M actionpack/lib/action_controller/routing/generation/polymorphic_routes.rb
M actionpack/lib/action_controller/routing/generation/url_rewriter.rb
M actionpack/lib/action_controller/routing/recognition_optimisation.rb
M actionpack/lib/action_controller/routing/resources.rb
M actionpack/lib/action_controller/routing/segments.rb
M actionpack/lib/action_controller/testing/integration.rb
M actionpack/lib/action_controller/testing/process.rb
M actionpack/lib/action_controller/testing/test_case.rb
M actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/adapter/camping.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/abstract/handler.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/abstract/request.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/basic.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/md5.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/nonce.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/params.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/digest/request.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/auth/openid.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/builder.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/cascade.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/chunked.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/commonlogger.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/conditionalget.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/content_length.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/content_type.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/deflater.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/directory.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/file.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/handler.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/cgi.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/evented_mongrel.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/fastcgi.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/lsws.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/mongrel.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/scgi.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/swiftiplied_mongrel.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/thin.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/handler/webrick.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/head.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/lint.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/lobster.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/lock.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/methodoverride.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/mime.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/mock.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/recursive.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/reloader.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/request.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/response.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/session/abstract/id.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/session/cookie.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/session/memcache.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/session/pool.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/showexceptions.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/showstatus.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/static.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/urlmap.rb
M actionpack/lib/action_controller/vendor/rack-1.0/rack/utils.rb
M actionpack/lib/action_dispatch/http/request.rb
M actionpack/lib/action_dispatch/http/response.rb
M actionpack/lib/action_dispatch/middleware/session/abstract_store.rb
M actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
M actionpack/lib/action_dispatch/rack.rb
M actionpack/lib/action_dispatch/rack/lock.rb
M actionpack/lib/action_dispatch/rack/multipart.rb
M actionpack/lib/action_dispatch/rack/parse_query.rb
M actionpack/lib/action_dispatch/utils/middleware_stack.rb
M actionpack/lib/action_dispatch/utils/url_encoded_pair_parser.rb
M actionpack/lib/action_pack/version.rb
M actionpack/lib/action_view/base.rb
M actionpack/lib/action_view/helpers/active_record_helper.rb
M actionpack/lib/action_view/helpers/asset_tag_helper.rb
M actionpack/lib/action_view/helpers/atom_feed_helper.rb
M actionpack/lib/action_view/helpers/capture_helper.rb
M actionpack/lib/action_view/helpers/date_helper.rb
M actionpack/lib/action_view/helpers/form_helper.rb
M actionpack/lib/action_view/helpers/form_options_helper.rb
M actionpack/lib/action_view/helpers/form_tag_helper.rb
M actionpack/lib/action_view/helpers/number_helper.rb
M actionpack/lib/action_view/helpers/prototype_helper.rb
M actionpack/lib/action_view/helpers/text_helper.rb
M actionpack/lib/action_view/helpers/translation_helper.rb
M actionpack/lib/action_view/helpers/url_helper.rb
M actionpack/lib/action_view/paths.rb
M actionpack/lib/action_view/render/rendering.rb
M actionpack/lib/action_view/template/renderable.rb
M actionpack/lib/action_view/template/template.rb
M actionpack/test/abstract_unit.rb
M actionpack/test/active_record_unit.rb
M actionpack/test/activerecord/active_record_store_test.rb
M actionpack/test/activerecord/render_partial_with_record_identification_test.rb
M actionpack/test/controller/assert_select_test.rb
M actionpack/test/controller/caching_test.rb
M actionpack/test/controller/cookie_test.rb
M actionpack/test/controller/dispatcher_test.rb
M actionpack/test/controller/fake_models.rb
M actionpack/test/controller/html-scanner/document_test.rb
M actionpack/test/controller/http_digest_authentication_test.rb
M actionpack/test/controller/integration_test.rb
M actionpack/test/controller/layout_test.rb
M actionpack/test/controller/mime_responds_test.rb
M actionpack/test/controller/polymorphic_routes_test.rb
M actionpack/test/controller/redirect_test.rb
M actionpack/test/controller/render_test.rb
M actionpack/test/controller/request/test_request_test.rb
M actionpack/test/controller/request_forgery_protection_test.rb
M actionpack/test/controller/rescue_test.rb
M actionpack/test/controller/resources_test.rb
M actionpack/test/controller/routing_test.rb
M actionpack/test/controller/selector_test.rb
M actionpack/test/controller/send_file_test.rb
M actionpack/test/controller/session/cookie_store_test.rb
M actionpack/test/controller/session/mem_cache_store_test.rb
M actionpack/test/controller/session/test_session_test.rb
M actionpack/test/controller/test_test.rb
M actionpack/test/controller/url_rewriter_test.rb
M actionpack/test/dispatch/middleware_stack_test.rb
M actionpack/test/dispatch/rack_test.rb
M actionpack/test/dispatch/request/multipart_params_parsing_test.rb
M actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb
M actionpack/test/dispatch/request_test.rb
M actionpack/test/fixtures/layouts/xhr.html.erb
M actionpack/test/fixtures/public/500.da.html
M actionpack/test/fixtures/quiz/questions/_question.html.erb
M actionpack/test/fixtures/test/hello_world.erb~
M actionpack/test/fixtures/test/hello_world.pt-BR.html.erb
M actionpack/test/fixtures/test/malformed/malformed.en.html.erb~
M actionpack/test/fixtures/test/malformed/malformed.erb~
M actionpack/test/fixtures/test/malformed/malformed.html.erb~
M actionpack/test/fixtures/test/render_implicit_html_template_from_xhr_request.da.html.erb
M actionpack/test/fixtures/test/utf8.html.erb
M actionpack/test/template/active_record_helper_i18n_test.rb
M actionpack/test/template/active_record_helper_test.rb
M actionpack/test/template/asset_tag_helper_test.rb
M actionpack/test/template/body_parts_test.rb
M actionpack/test/template/compiled_templates_test.rb
M actionpack/test/template/date_helper_i18n_test.rb
M actionpack/test/template/date_helper_test.rb
M actionpack/test/template/form_helper_test.rb
M actionpack/test/template/form_options_helper_test.rb
M actionpack/test/template/form_tag_helper_test.rb
M actionpack/test/template/javascript_helper_test.rb
M actionpack/test/template/number_helper_i18n_test.rb
M actionpack/test/template/number_helper_test.rb
M actionpack/test/template/output_buffer_test.rb
M actionpack/test/template/render_test.rb
M actionpack/test/template/test_test.rb
M actionpack/test/template/text_helper_test.rb
M actionpack/test/template/translation_helper_test.rb
M actionpack/test/template/url_helper_test.rb
M activemodel/lib/active_model/validations/inclusion.rb
M activemodel/test/state_machine/event_test.rb
M activerecord/CHANGELOG
M activerecord/Rakefile
M activerecord/lib/active_record.rb
M activerecord/lib/active_record/associations.rb
M activerecord/lib/active_record/associations/association_collection.rb
M activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
M activerecord/lib/active_record/associations/has_many_association.rb
M activerecord/lib/active_record/associations/has_many_through_association.rb
M activerecord/lib/active_record/associations/has_one_association.rb
M activerecord/lib/active_record/attribute_methods.rb
M activerecord/lib/active_record/autosave_association.rb
M activerecord/lib/active_record/base.rb
M activerecord/lib/active_record/batches.rb
M activerecord/lib/active_record/calculations.rb
M activerecord/lib/active_record/callbacks.rb
M activerecord/lib/active_record/connection_adapters/abstract/connection_pool.rb
M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
M activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
M activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
M activerecord/lib/active_record/fixtures.rb
M activerecord/lib/active_record/locking/optimistic.rb
M activerecord/lib/active_record/migration.rb
M activerecord/lib/active_record/named_scope.rb
M activerecord/lib/active_record/nested_attributes.rb
M activerecord/lib/active_record/reflection.rb
M activerecord/lib/active_record/serializers/json_serializer.rb
M activerecord/lib/active_record/serializers/xml_serializer.rb
M activerecord/lib/active_record/session_store.rb
M activerecord/lib/active_record/test_case.rb
M activerecord/lib/active_record/transactions.rb
M activerecord/lib/active_record/validations.rb
M activerecord/lib/active_record/version.rb
M activerecord/test/cases/associations/belongs_to_associations_test.rb
M activerecord/test/cases/associations/eager_load_nested_include_test.rb
M activerecord/test/cases/associations/eager_test.rb
M activerecord/test/cases/associations/has_and_belongs_to_many_associations_test.rb
M activerecord/test/cases/associations/has_many_associations_test.rb
M activerecord/test/cases/associations/has_many_through_associations_test.rb
M activerecord/test/cases/associations/has_one_associations_test.rb
M activerecord/test/cases/associations/has_one_through_associations_test.rb
M activerecord/test/cases/associations/join_model_test.rb
M activerecord/test/cases/attribute_methods_test.rb
M activerecord/test/cases/autosave_association_test.rb
M activerecord/test/cases/base_test.rb
M activerecord/test/cases/batches_test.rb
M activerecord/test/cases/calculations_test.rb
M activerecord/test/cases/callbacks_test.rb
M activerecord/test/cases/connection_pool_test.rb
M activerecord/test/cases/datatype_test_postgresql.rb
M activerecord/test/cases/dirty_test.rb
M activerecord/test/cases/finder_test.rb
M activerecord/test/cases/fixtures_test.rb
M activerecord/test/cases/helper.rb
M activerecord/test/cases/inheritance_test.rb
M activerecord/test/cases/locking_test.rb
M activerecord/test/cases/method_scoping_test.rb
M activerecord/test/cases/migration_test.rb
M activerecord/test/cases/named_scope_test.rb
M activerecord/test/cases/nested_attributes_test.rb
M activerecord/test/cases/query_cache_test.rb
M activerecord/test/cases/reflection_test.rb
M activerecord/test/cases/schema_test_postgresql.rb
M activerecord/test/cases/transactions_test.rb
M activerecord/test/cases/validations_i18n_test.rb
M activerecord/test/cases/validations_test.rb
M activerecord/test/cases/xml_serialization_test.rb
M activerecord/test/fixtures/toys.yml
M activerecord/test/models/bird.rb
M activerecord/test/models/company.rb
M activerecord/test/models/event.rb
M activerecord/test/models/owner.rb
M activerecord/test/models/parrot.rb
M activerecord/test/models/pet.rb
M activerecord/test/models/pirate.rb
M activerecord/test/models/post.rb
M activerecord/test/models/reply.rb
M activerecord/test/models/ship.rb
M activerecord/test/models/ship_part.rb
M activerecord/test/models/topic.rb
M activerecord/test/models/toy.rb
M activerecord/test/schema/schema.rb
M activeresource/CHANGELOG
M activeresource/README
M activeresource/Rakefile
M activeresource/lib/active_resource/base.rb
M activeresource/lib/active_resource/connection.rb
M activeresource/lib/active_resource/http_mock.rb
M activeresource/lib/active_resource/validations.rb
M activeresource/lib/active_resource/version.rb
M activeresource/test/abstract_unit.rb
M activeresource/test/authorization_test.rb
M activeresource/test/base_test.rb
M activeresource/test/connection_test.rb
M activeresource/test/setter_trap.rb
M activesupport/CHANGELOG
M activesupport/lib/active_support/cache/strategy/local_cache.rb
M activesupport/lib/active_support/core_ext/array.rb
M activesupport/lib/active_support/core_ext/array/conversions.rb
M activesupport/lib/active_support/core_ext/array/wrapper.rb
M activesupport/lib/active_support/core_ext/date/calculations.rb
M activesupport/lib/active_support/core_ext/file/atomic.rb
M activesupport/lib/active_support/core_ext/hash/conversions.rb
M activesupport/lib/active_support/core_ext/hash/indifferent_access.rb
M activesupport/lib/active_support/core_ext/string/inflections.rb
M activesupport/lib/active_support/core_ext/time/calculations.rb
M activesupport/lib/active_support/core_ext/time/conversions.rb
M activesupport/lib/active_support/core_ext/try.rb
M activesupport/lib/active_support/core_ext/uri.rb
M activesupport/lib/active_support/duration.rb
M activesupport/lib/active_support/inflections.rb
M activesupport/lib/active_support/inflector.rb
M activesupport/lib/active_support/json/decoding.rb
M activesupport/lib/active_support/json/encoders/hash.rb
M activesupport/lib/active_support/memoizable.rb
M activesupport/lib/active_support/multibyte/chars.rb
M activesupport/lib/active_support/ordered_hash.rb
M activesupport/lib/active_support/test_case.rb
M activesupport/lib/active_support/testing/assertions.rb
M activesupport/lib/active_support/testing/core_ext/test.rb
M activesupport/lib/active_support/testing/core_ext/test/unit/assertions.rb
M activesupport/lib/active_support/testing/setup_and_teardown.rb
M activesupport/lib/active_support/time_with_zone.rb
M activesupport/lib/active_support/vendor.rb
M activesupport/lib/active_support/vendor/i18n-0.1.1/.gitignore
M activesupport/lib/active_support/vendor/i18n-0.1.1/MIT-LICENSE
M activesupport/lib/active_support/vendor/i18n-0.1.1/README.textile
M activesupport/lib/active_support/vendor/i18n-0.1.1/Rakefile
M activesupport/lib/active_support/vendor/i18n-0.1.1/i18n.gemspec
M activesupport/lib/active_support/vendor/i18n-0.1.1/lib/i18n.rb
M activesupport/lib/active_support/vendor/i18n-0.1.1/lib/i18n/backend/simple.rb
M activesupport/lib/active_support/vendor/i18n-0.1.1/lib/i18n/exceptions.rb
M activesupport/lib/active_support/vendor/i18n-0.1.1/test/all.rb
M activesupport/lib/active_support/vendor/i18n-0.1.1/test/i18n_exceptions_test.rb
M activesupport/lib/active_support/vendor/i18n-0.1.1/test/i18n_test.rb
M activesupport/lib/active_support/vendor/i18n-0.1.1/test/locale/en.rb
M activesupport/lib/active_support/vendor/i18n-0.1.1/test/locale/en.yml
M activesupport/lib/active_support/vendor/i18n-0.1.1/test/simple_backend_test.rb
M activesupport/lib/active_support/vendor/i18n-0.1.3/MIT-LICENSE
M activesupport/lib/active_support/vendor/i18n-0.1.3/README.textile
M activesupport/lib/active_support/vendor/i18n-0.1.3/Rakefile
M activesupport/lib/active_support/vendor/i18n-0.1.3/i18n.gemspec
M activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n.rb
M activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n/backend/simple.rb
M activesupport/lib/active_support/vendor/i18n-0.1.3/lib/i18n/exceptions.rb
M activesupport/lib/active_support/vendor/i18n-0.1.3/test/all.rb
M activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_exceptions_test.rb
M activesupport/lib/active_support/vendor/i18n-0.1.3/test/i18n_test.rb
M activesupport/lib/active_support/vendor/i18n-0.1.3/test/locale/en.rb
M activesupport/lib/active_support/vendor/i18n-0.1.3/test/locale/en.yml
M activesupport/lib/active_support/vendor/i18n-0.1.3/test/simple_backend_test.rb
M activesupport/lib/active_support/vendor/memcache-client-1.5.0.5/memcache.rb
M activesupport/lib/active_support/vendor/memcache-client-1.6.5/memcache.rb
M activesupport/lib/active_support/version.rb
M activesupport/lib/active_support/xml_mini.rb
M activesupport/lib/active_support/xml_mini/libxml.rb
M activesupport/lib/active_support/xml_mini/nokogiri.rb
M activesupport/lib/active_support/xml_mini/rexml.rb
M activesupport/test/abstract_unit.rb
M activesupport/test/core_ext/array_ext_test.rb
M activesupport/test/core_ext/class_test.rb
M activesupport/test/core_ext/date_ext_test.rb
M activesupport/test/core_ext/duration_test.rb
M activesupport/test/core_ext/hash_ext_test.rb
M activesupport/test/core_ext/load_error_test.rb
M activesupport/test/core_ext/module/synchronization_test.rb
M activesupport/test/core_ext/module_test.rb
M activesupport/test/core_ext/object_and_class_ext_test.rb
M activesupport/test/core_ext/string_ext_test.rb
M activesupport/test/core_ext/time_ext_test.rb
M activesupport/test/core_ext/time_with_zone_test.rb
M activesupport/test/core_ext/uri_ext_test.rb
M activesupport/test/dependencies_test.rb
M activesupport/test/inflector_test.rb
M activesupport/test/inflector_test_cases.rb
M activesupport/test/json/decoding_test.rb
M activesupport/test/json/encoding_test.rb
M activesupport/test/memoizable_test.rb
M activesupport/test/message_encryptor_test.rb
M activesupport/test/message_verifier_test.rb
M activesupport/test/multibyte_chars_test.rb
M activesupport/test/ordered_hash_test.rb
M activesupport/test/string_inquirer_test.rb
M activesupport/test/test_test.rb
M activesupport/test/time_zone_test.rb
M activesupport/test/xml_mini/nokogiri_engine_test.rb
M activesupport/test/xml_mini/rexml_engine_test.rb
M ci/ci_build.rb
M ci/geminstaller.yml
M railties/CHANGELOG
M railties/Rakefile
M railties/builtin/rails_info/rails/info.rb
M railties/builtin/rails_info/rails/info_controller.rb
M railties/configs/databases/mysql.yml
M railties/configs/initializers/backtrace_silencers.rb
M railties/doc/guides/asciidoc.conf
M railties/doc/guides/html/2_2_release_notes.html
M railties/doc/guides/html/action_mailer_basics.html
M railties/doc/guides/html/actioncontroller_basics.html
M railties/doc/guides/html/active_record_querying.html
M railties/doc/guides/html/activerecord_validations_callbacks.html
M railties/doc/guides/html/association_basics.html
M railties/doc/guides/html/authors.html
M railties/doc/guides/html/caching_with_rails.html
M railties/doc/guides/html/command_line.html
M railties/doc/guides/html/configuring.html
M railties/doc/guides/html/creating_plugins.html
M railties/doc/guides/html/debugging_rails_applications.html
M railties/doc/guides/html/form_helpers.html
M railties/doc/guides/html/getting_started_with_rails.html
M railties/doc/guides/html/i18n.html
M railties/doc/guides/html/index.html
M railties/doc/guides/html/layouts_and_rendering.html
M railties/doc/guides/html/migrations.html
M railties/doc/guides/html/performance_testing.html
M railties/doc/guides/html/rails_on_rack.html
M railties/doc/guides/html/routing_outside_in.html
M railties/doc/guides/html/security.html
M railties/doc/guides/html/testing_rails_applications.html
M railties/doc/guides/source/2_2_release_notes.txt
M railties/doc/guides/source/action_mailer_basics.txt
M railties/doc/guides/source/actioncontroller_basics/changelog.txt
M railties/doc/guides/source/actioncontroller_basics/cookies.txt
M railties/doc/guides/source/actioncontroller_basics/csrf.txt
M railties/doc/guides/source/actioncontroller_basics/filters.txt
M railties/doc/guides/source/actioncontroller_basics/http_auth.txt
M railties/doc/guides/source/actioncontroller_basics/index.txt
M railties/doc/guides/source/actioncontroller_basics/introduction.txt
M railties/doc/guides/source/actioncontroller_basics/methods.txt
M railties/doc/guides/source/actioncontroller_basics/parameter_filtering.txt
M railties/doc/guides/source/actioncontroller_basics/params.txt
M railties/doc/guides/source/actioncontroller_basics/request_response_objects.txt
M railties/doc/guides/source/actioncontroller_basics/rescue.txt
M railties/doc/guides/source/actioncontroller_basics/session.txt
M railties/doc/guides/source/actioncontroller_basics/streaming.txt
M railties/doc/guides/source/actioncontroller_basics/verification.txt
M railties/doc/guides/source/active_record_basics.txt
M railties/doc/guides/source/active_record_querying.txt
M railties/doc/guides/source/activerecord_validations_callbacks.txt
M railties/doc/guides/source/association_basics.txt
M railties/doc/guides/source/authors.txt
M railties/doc/guides/source/caching_with_rails.txt
M railties/doc/guides/source/command_line.txt
M railties/doc/guides/source/configuring.txt
M railties/doc/guides/source/creating_plugins/acts_as_yaffle.txt
M railties/doc/guides/source/creating_plugins/appendix.txt
M railties/doc/guides/source/creating_plugins/controllers.txt
M railties/doc/guides/source/creating_plugins/core_ext.txt
M railties/doc/guides/source/creating_plugins/gem.txt
M railties/doc/guides/source/creating_plugins/gems.txt
M railties/doc/guides/source/creating_plugins/generator_commands.txt
M railties/doc/guides/source/creating_plugins/generator_method.txt
M railties/doc/guides/source/creating_plugins/generators.txt
M railties/doc/guides/source/creating_plugins/helpers.txt
M railties/doc/guides/source/creating_plugins/index.txt
M railties/doc/guides/source/creating_plugins/migrations.txt
M railties/doc/guides/source/creating_plugins/models.txt
M railties/doc/guides/source/creating_plugins/rdoc.txt
M railties/doc/guides/source/creating_plugins/routes.txt
M railties/doc/guides/source/creating_plugins/setup.txt
M railties/doc/guides/source/creating_plugins/tasks.txt
M railties/doc/guides/source/creating_plugins/test_setup.txt
M railties/doc/guides/source/creating_plugins/tests.txt
M railties/doc/guides/source/debugging_rails_applications.txt
M railties/doc/guides/source/form_helpers.txt
M railties/doc/guides/source/getting_started_with_rails.txt
M railties/doc/guides/source/i18n.txt
M railties/doc/guides/source/images/belongs_to.png
M railties/doc/guides/source/images/bullet.gif
M railties/doc/guides/source/images/csrf.png
M railties/doc/guides/source/images/customized_error_messages.png
M railties/doc/guides/source/images/error_messages.png
M railties/doc/guides/source/images/habtm.png
M railties/doc/guides/source/images/has_many.png
M railties/doc/guides/source/images/has_many_through.png
M railties/doc/guides/source/images/has_one.png
M railties/doc/guides/source/images/has_one_through.png
M railties/doc/guides/source/images/header_backdrop.png
M railties/doc/guides/source/images/i18n/demo_localized_pirate.png
M railties/doc/guides/source/images/i18n/demo_translated_en.png
M railties/doc/guides/source/images/i18n/demo_translated_pirate.png
M railties/doc/guides/source/images/i18n/demo_translation_missing.png
M railties/doc/guides/source/images/i18n/demo_untranslated.png
M railties/doc/guides/source/images/icons/README
M railties/doc/guides/source/images/icons/callouts/1.png
M railties/doc/guides/source/images/icons/callouts/10.png
M railties/doc/guides/source/images/icons/callouts/11.png
M railties/doc/guides/source/images/icons/callouts/12.png
M railties/doc/guides/source/images/icons/callouts/13.png
M railties/doc/guides/source/images/icons/callouts/14.png
M railties/doc/guides/source/images/icons/callouts/15.png
M railties/doc/guides/source/images/icons/callouts/2.png
M railties/doc/guides/source/images/icons/callouts/3.png
M railties/doc/guides/source/images/icons/callouts/4.png
M railties/doc/guides/source/images/icons/callouts/5.png
M railties/doc/guides/source/images/icons/callouts/6.png
M railties/doc/guides/source/images/icons/callouts/7.png
M railties/doc/guides/source/images/icons/callouts/8.png
M railties/doc/guides/source/images/icons/callouts/9.png
M railties/doc/guides/source/images/icons/caution.png
M railties/doc/guides/source/images/icons/example.png
M railties/doc/guides/source/images/icons/home.png
M railties/doc/guides/source/images/icons/important.png
M railties/doc/guides/source/images/icons/next.png
M railties/doc/guides/source/images/icons/note.png
M railties/doc/guides/source/images/icons/prev.png
M railties/doc/guides/source/images/icons/tip.png
M railties/doc/guides/source/images/icons/up.png
M railties/doc/guides/source/images/icons/warning.png
M railties/doc/guides/source/images/polymorphic.png
M railties/doc/guides/source/images/rails_logo_remix.gif
M railties/doc/guides/source/images/ruby_on_rails_by_mike_rundle2.gif
M railties/doc/guides/source/images/session_fixation.png
M railties/doc/guides/source/images/validation_error_messages.png
M railties/doc/guides/source/index.txt
M railties/doc/guides/source/layouts_and_rendering.txt
M railties/doc/guides/source/migrations/anatomy_of_a_migration.txt
M railties/doc/guides/source/migrations/changelog.txt
M railties/doc/guides/source/migrations/creating_a_migration.txt
M railties/doc/guides/source/migrations/foreign_keys.txt
M railties/doc/guides/source/migrations/index.txt
M railties/doc/guides/source/migrations/rakeing_around.txt
M railties/doc/guides/source/migrations/scheming.txt
M railties/doc/guides/source/migrations/using_models_in_migrations.txt
M railties/doc/guides/source/migrations/writing_a_migration.txt
M railties/doc/guides/source/performance_testing.txt
M railties/doc/guides/source/rails_on_rack.txt
M railties/doc/guides/source/routing_outside_in.txt
M railties/doc/guides/source/security.txt
M railties/doc/guides/source/stylesheets/base.css
M railties/doc/guides/source/stylesheets/forms.css
M railties/doc/guides/source/stylesheets/more.css
M railties/doc/guides/source/templates/guides.html.erb
M railties/doc/guides/source/testing_rails_applications.txt
M railties/environments/boot.rb
M railties/guides/files/javascripts/code_highlighter.js
M railties/guides/files/javascripts/guides.js
M railties/guides/files/javascripts/highlighters.js
M railties/guides/files/stylesheets/main.css
M railties/guides/files/stylesheets/print.css
M railties/guides/files/stylesheets/reset.css
M railties/guides/files/stylesheets/style.css
M railties/guides/files/stylesheets/syntax.css
M railties/guides/images/belongs_to.png
M railties/guides/images/book_icon.gif
M railties/guides/images/bullet.gif
M railties/guides/images/chapters_icon.gif
M railties/guides/images/check_bullet.gif
M railties/guides/images/credits_pic_blank.gif
M railties/guides/images/csrf.png
M railties/guides/images/customized_error_messages.png
M railties/guides/images/error_messages.png
M railties/guides/images/feature_tile.gif
M railties/guides/images/footer_tile.gif
M railties/guides/images/fxn.jpg
M railties/guides/images/grey_bullet.gif
M railties/guides/images/habtm.png
M railties/guides/images/has_many.png
M railties/guides/images/has_many_through.png
M railties/guides/images/has_one.png
M railties/guides/images/has_one_through.png
M railties/guides/images/header_backdrop.png
M railties/guides/images/header_tile.gif
M railties/guides/images/i18n/demo_localized_pirate.png
M railties/guides/images/i18n/demo_translated_en.png
M railties/guides/images/i18n/demo_translated_pirate.png
M railties/guides/images/i18n/demo_translation_missing.png
M railties/guides/images/i18n/demo_untranslated.png
M railties/guides/images/icons/README
M railties/guides/images/icons/callouts/1.png
M railties/guides/images/icons/callouts/10.png
M railties/guides/images/icons/callouts/11.png
M railties/guides/images/icons/callouts/12.png
M railties/guides/images/icons/callouts/13.png
M railties/guides/images/icons/callouts/14.png
M railties/guides/images/icons/callouts/15.png
M railties/guides/images/icons/callouts/2.png
M railties/guides/images/icons/callouts/3.png
M railties/guides/images/icons/callouts/4.png
M railties/guides/images/icons/callouts/5.png
M railties/guides/images/icons/callouts/6.png
M railties/guides/images/icons/callouts/7.png
M railties/guides/images/icons/callouts/8.png
M railties/guides/images/icons/callouts/9.png
M railties/guides/images/icons/caution.png
M railties/guides/images/icons/example.png
M railties/guides/images/icons/home.png
M railties/guides/images/icons/important.png
M railties/guides/images/icons/next.png
M railties/guides/images/icons/note.png
M railties/guides/images/icons/prev.png
M railties/guides/images/icons/tip.png
M railties/guides/images/icons/up.png
M railties/guides/images/icons/warning.png
M railties/guides/images/nav_arrow.gif
M railties/guides/images/polymorphic.png
M railties/guides/images/posts_index.png
M railties/guides/images/rails_guides_logo.gif
M railties/guides/images/rails_logo_remix.gif
M railties/guides/images/rails_welcome.png
M railties/guides/images/session_fixation.png
M railties/guides/images/tab_grey.gif
M railties/guides/images/tab_info.gif
M railties/guides/images/tab_note.gif
M railties/guides/images/tab_red.gif
M railties/guides/images/tab_yellow.gif
M railties/guides/images/tab_yellow.png
M railties/guides/images/validation_error_messages.png
M railties/guides/rails_guides.rb
M railties/guides/rails_guides/generator.rb
M railties/guides/rails_guides/helpers.rb
M railties/guides/rails_guides/indexer.rb
M railties/guides/rails_guides/levenshtein.rb
M railties/guides/rails_guides/textile_extensions.rb
M railties/guides/source/2_2_release_notes.textile
M railties/guides/source/2_3_release_notes.textile
M railties/guides/source/action_controller_overview.textile
M railties/guides/source/action_mailer_basics.textile
M railties/guides/source/active_record_basics.textile
M railties/guides/source/active_record_querying.textile
M railties/guides/source/activerecord_validations_callbacks.textile
M railties/guides/source/association_basics.textile
M railties/guides/source/caching_with_rails.textile
M railties/guides/source/command_line.textile
M railties/guides/source/configuring.textile
M railties/guides/source/contribute.textile
M railties/guides/source/contributing_to_rails.textile
M railties/guides/source/credits.erb.textile
M railties/guides/source/debugging_rails_applications.textile
M railties/guides/source/form_helpers.textile
M railties/guides/source/getting_started.textile
M railties/guides/source/i18n.textile
M railties/guides/source/index.erb.textile
M railties/guides/source/layout.html.erb
M railties/guides/source/layouts_and_rendering.textile
M railties/guides/source/migrations.textile
M railties/guides/source/nested_model_forms.textile
M railties/guides/source/performance_testing.textile
M railties/guides/source/plugins.textile
M railties/guides/source/rails_on_rack.textile
M railties/guides/source/routing.textile
M railties/guides/source/security.textile
M railties/guides/source/testing.textile
M railties/html/500.html
M railties/html/index.html
M railties/lib/commands/plugin.rb
M railties/lib/commands/server.rb
M railties/lib/console_app.rb
M railties/lib/fcgi_handler.rb
M railties/lib/initializer.rb
M railties/lib/rails/backtrace_cleaner.rb
M railties/lib/rails/gem_dependency.rb
M railties/lib/rails/plugin.rb
M railties/lib/rails/plugin/loader.rb
M railties/lib/rails/rack/metal.rb
M railties/lib/rails/rack/static.rb
M railties/lib/rails/version.rb
M railties/lib/rails_generator/commands.rb
M railties/lib/rails_generator/generators/applications/app/template_runner.rb
M railties/lib/rails_generator/generators/components/scaffold/templates/controller.rb
M railties/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb
M railties/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb
M railties/lib/rails_generator/generators/components/scaffold/templates/view_edit.html.erb
M railties/lib/rails_generator/generators/components/scaffold/templates/view_index.html.erb
M railties/lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb
M railties/lib/tasks/databases.rake
M railties/lib/tasks/documentation.rake
M railties/lib/tasks/gems.rake
M railties/lib/tasks/testing.rake
M railties/test/abstract_unit.rb
M railties/test/backtrace_cleaner_test.rb
M railties/test/boot_test.rb
M railties/test/console_app_test.rb
M railties/test/error_page_test.rb
M railties/test/fcgi_dispatcher_test.rb
M railties/test/fixtures/metal/multiplemetals/app/metal/metal_a.rb
M railties/test/fixtures/metal/multiplemetals/app/metal/metal_b.rb
M railties/test/fixtures/metal/pluralmetal/app/metal/legacy_routes.rb
M railties/test/fixtures/metal/singlemetal/app/metal/foo_metal.rb
M railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_a.rb
M railties/test/fixtures/metal/subfolders/app/metal/Folder/metal_b.rb
M railties/test/fixtures/plugins/engines/engine/app/metal/engine_metal.rb
M railties/test/fixtures/plugins/engines/engine/init.rb
M railties/test/fixtures/public/foo/bar.html
M railties/test/fixtures/public/foo/index.html
M railties/test/fixtures/public/index.html
M railties/test/gem_dependency_test.rb
M railties/test/generators/rails_scaffold_generator_test.rb
M railties/test/generators/rails_template_runner_test.rb
M railties/test/initializer_test.rb
M railties/test/metal_test.rb
M railties/test/plugin_loader_test.rb
M railties/test/plugin_locator_test.rb
M railties/test/plugin_test.rb
M railties/test/rack_static_test.rb
M railties/test/rails_info_controller_test.rb
M railties/test/rails_info_test.rb
M railties/test/vendor/gems/dummy-gem-g-1.0.0/.specification