This project is archived and is in readonly mode.

Changeset [98dc582742779081e71e697fcdf8d9ae2b421b16] by Pratik Naik

Revision 98dc582742779081e71e697fcdf8d9ae2b421b16, committed by Repository · May 25th, 2008 @ 12:29 PM

Merge docrails.

Signed-off-by: Pratik Naik

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

85 changed files

M actionmailer/lib/action_mailer/base.rb
M actionmailer/lib/action_mailer/helpers.rb
M actionmailer/lib/action_mailer/part.rb
M actionpack/lib/action_controller/assertions/model_assertions.rb
M actionpack/lib/action_controller/assertions/routing_assertions.rb
M actionpack/lib/action_controller/assertions/selector_assertions.rb
M actionpack/lib/action_controller/assertions/tag_assertions.rb
M actionpack/lib/action_controller/base.rb
M actionpack/lib/action_controller/cgi_ext/cookie.rb
M actionpack/lib/action_controller/cgi_process.rb
M actionpack/lib/action_controller/filters.rb
M actionpack/lib/action_controller/helpers.rb
M actionpack/lib/action_controller/integration.rb
M actionpack/lib/action_controller/mime_type.rb
M actionpack/lib/action_controller/polymorphic_routes.rb
M actionpack/lib/action_controller/resources.rb
M actionpack/lib/action_controller/routing/builder.rb
M actionpack/lib/action_controller/session/cookie_store.rb
M actionpack/lib/action_controller/test_process.rb
M actionpack/lib/action_view/helpers/asset_tag_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/prototype_helper.rb
M actionpack/lib/action_view/helpers/record_tag_helper.rb
M actionpack/lib/action_view/helpers/sanitize_helper.rb
M actionpack/lib/action_view/helpers/scriptaculous_helper.rb
M actionpack/lib/action_view/helpers/url_helper.rb
M actionpack/lib/action_view/template.rb
M activerecord/lib/active_record/aggregations.rb
M activerecord/lib/active_record/associations.rb
M activerecord/lib/active_record/associations/association_collection.rb
M activerecord/lib/active_record/associations/has_many_through_association.rb
M activerecord/lib/active_record/attribute_methods.rb
M activerecord/lib/active_record/base.rb
M activerecord/lib/active_record/calculations.rb
M activerecord/lib/active_record/callbacks.rb
M activerecord/lib/active_record/connection_adapters/abstract/connection_specification.rb
M activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
M activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb
M activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
M activerecord/lib/active_record/connection_adapters/postgresql_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/observer.rb
M activerecord/lib/active_record/schema.rb
M activerecord/lib/active_record/schema_dumper.rb
M activerecord/lib/active_record/serializers/xml_serializer.rb
M activerecord/lib/active_record/transactions.rb
M activerecord/lib/active_record/validations.rb
M activeresource/lib/active_resource/base.rb
M activeresource/lib/active_resource/custom_methods.rb
M activeresource/lib/active_resource/formats/xml_format.rb
M activeresource/lib/active_resource/http_mock.rb
M activeresource/lib/active_resource/validations.rb
M activesupport/lib/active_support/core_ext/hash/conversions.rb
M activesupport/lib/active_support/core_ext/integer/even_odd.rb
M activesupport/lib/active_support/core_ext/object/misc.rb
M activesupport/lib/active_support/core_ext/string/unicode.rb
M activesupport/lib/active_support/core_ext/time/conversions.rb
M activesupport/lib/active_support/core_ext/time/zones.rb
M activesupport/lib/active_support/deprecation.rb
M activesupport/lib/active_support/inflector.rb
M activesupport/lib/active_support/json.rb
M activesupport/lib/active_support/json/decoding.rb
M activesupport/lib/active_support/multibyte/chars.rb
M activesupport/lib/active_support/multibyte/handlers/utf8_handler.rb
M activesupport/lib/active_support/time_with_zone.rb
M activesupport/lib/active_support/values/time_zone.rb
M railties/configs/databases/frontbase.yml
M railties/configs/databases/mysql.yml
M railties/configs/databases/oracle.yml
M railties/configs/databases/postgresql.yml
M railties/configs/databases/sqlite2.yml
M railties/configs/databases/sqlite3.yml
M railties/configs/initializers/new_rails_defaults.rb
M railties/environments/environment.rb
M railties/environments/test.rb
M railties/lib/initializer.rb
M railties/lib/rails_generator/base.rb
M railties/lib/tasks/databases.rake
M railties/test/fixtures/about_yml_plugins/bad_about_yml/about.yml
M railties/test/generators/generator_test_helper.rb