This project is archived and is in readonly mode.
Changeset [186cd7bc530f705b889c27f3680ab48c7c10a6f3] by Mikel Lindsaar
December 17th, 2009 @ 12:24 AM
Merge branch 'rails'
Conflicts:
actionmailer/lib/action_mailer.rb
actionmailer/lib/action_mailer/delivery_method/smtp.rb
http://github.com/rails/rails/commit/186cd7bc530f705b889c27f3680ab4...
Committed by Mikel Lindsaar
- A actionpack/lib/action_controller/metal/rescue.rb
- A actionpack/lib/action_controller/test_case.rb
- A actionpack/lib/action_dispatch/testing/test_process.rb
- A actionpack/lib/action_view/template.rb
- A activerecord/test/cases/yaml_serialization_test.rb
- A activesupport/lib/active_support/dependencies/autoload.rb
- A activesupport/lib/active_support/notifications/fanout.rb
- A activesupport/lib/active_support/notifications/instrumenter.rb
- A activesupport/test/autoload.rb
- A activesupport/test/fixtures/autoload/another_class.rb
- A activesupport/test/fixtures/autoload/some_class.rb
- A rails.gemspec
- A railties/lib/rails/generators/rails/app/templates/script/console.tt
- A railties/lib/rails/generators/rails/app/templates/script/dbconsole.tt
- A railties/lib/rails/generators/rails/app/templates/script/server.tt
- A railties/lib/rails/vendor/thor-0.12.1/CHANGELOG.rdoc
- A railties/lib/rails/vendor/thor-0.12.1/LICENSE
- A railties/lib/rails/vendor/thor-0.12.1/README.rdoc
- A railties/lib/rails/vendor/thor-0.12.1/Thorfile
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor.rb
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor/actions.rb
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor/actions/create_file.rb
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor/actions/directory.rb
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor/actions/empty_directory.rb
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor/actions/file_manipulation.rb
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor/actions/inject_into_file.rb
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor/base.rb
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor/core_ext/hash_with_indifferent_access.rb
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor/core_ext/ordered_hash.rb
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor/error.rb
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor/group.rb
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor/invocation.rb
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor/parser.rb
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor/parser/argument.rb
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor/parser/arguments.rb
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor/parser/option.rb
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor/parser/options.rb
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor/rake_compat.rb
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor/runner.rb
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor/shell.rb
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor/shell/basic.rb
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor/shell/color.rb
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor/task.rb
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor/util.rb
- A railties/lib/rails/vendor/thor-0.12.1/lib/thor/version.rb
- A railties/railties.gemspec
- A railties/test/application/routing_test.rb
- A railties/test/plugins/configuration_test.rb
- R actionpack/lib/abstract_controller/exceptions.rb
- R actionpack/lib/action_controller/metal/rescuable.rb
- R actionpack/lib/action_controller/testing/process.rb
- R actionpack/lib/action_controller/testing/test_case.rb
- R actionpack/lib/action_view/template/template.rb
- R activesupport/lib/active_support/autoload.rb
- R railties/lib/rails/generators/rails/app/templates/script/console
- R railties/lib/rails/generators/rails/app/templates/script/dbconsole
- R railties/lib/rails/generators/rails/app/templates/script/server
- R railties/lib/rails/vendor/thor-0.12.0/CHANGELOG.rdoc
- R railties/lib/rails/vendor/thor-0.12.0/LICENSE
- R railties/lib/rails/vendor/thor-0.12.0/README.rdoc
- R railties/lib/rails/vendor/thor-0.12.0/Thorfile
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor.rb
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor/actions.rb
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor/actions/create_file.rb
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor/actions/directory.rb
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor/actions/empty_directory.rb
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor/actions/file_manipulation.rb
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor/actions/inject_into_file.rb
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor/base.rb
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor/core_ext/hash_with_indifferent_access.rb
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor/core_ext/ordered_hash.rb
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor/error.rb
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor/group.rb
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor/invocation.rb
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor/parser.rb
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor/parser/argument.rb
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor/parser/arguments.rb
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor/parser/option.rb
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor/parser/options.rb
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor/rake_compat.rb
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor/runner.rb
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor/shell.rb
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor/shell/basic.rb
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor/shell/color.rb
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor/task.rb
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor/util.rb
- R railties/lib/rails/vendor/thor-0.12.0/lib/thor/version.rb
- R railties/rails.gemspec
- M .gitignore
- M .gitmodules
- M Rakefile
- M actionmailer/Rakefile
- M actionmailer/lib/action_mailer.rb
- M actionmailer/lib/action_mailer/base.rb
- M actionmailer/lib/action_mailer/delivery_method/file.rb
- M actionmailer/lib/action_mailer/mail_helper.rb
- M actionmailer/test/abstract_unit.rb
- M actionmailer/test/mail_service_test.rb
- M actionmailer/test/url_test.rb
- M actionpack/Rakefile
- M actionpack/actionpack.gemspec
- M actionpack/lib/abstract_controller.rb
- M actionpack/lib/abstract_controller/base.rb
- M actionpack/lib/abstract_controller/rendering_controller.rb
- M actionpack/lib/action_controller.rb
- M actionpack/lib/action_controller/base.rb
- M actionpack/lib/action_controller/caching.rb
- M actionpack/lib/action_controller/dispatch/dispatcher.rb
- M actionpack/lib/action_controller/metal/compatibility.rb
- M actionpack/lib/action_controller/metal/exceptions.rb
- M actionpack/lib/action_controller/metal/flash.rb
- M actionpack/lib/action_controller/metal/helpers.rb
- M actionpack/lib/action_controller/metal/render_options.rb
- M actionpack/lib/action_controller/metal/responder.rb
- M actionpack/lib/action_controller/vendor/html-scanner.rb
- M actionpack/lib/action_dispatch.rb
- M actionpack/lib/action_dispatch/http/request.rb
- M actionpack/lib/action_dispatch/http/response.rb
- M actionpack/lib/action_dispatch/http/status_codes.rb
- M actionpack/lib/action_dispatch/middleware/show_exceptions.rb
- M actionpack/lib/action_dispatch/middleware/templates/rescues/_trace.erb
- M actionpack/lib/action_dispatch/routing.rb
- M actionpack/lib/action_dispatch/routing/deprecated_mapper.rb
- M actionpack/lib/action_dispatch/routing/mapper.rb
- M actionpack/lib/action_dispatch/routing/route_set.rb
- M actionpack/lib/action_dispatch/testing/assertions/routing.rb
- M actionpack/lib/action_dispatch/testing/assertions/tag.rb
- M actionpack/lib/action_dispatch/testing/integration.rb
- M actionpack/lib/action_dispatch/testing/performance_test.rb
- M actionpack/lib/action_view.rb
- M actionpack/lib/action_view/base.rb
- M actionpack/lib/action_view/paths.rb
- M actionpack/lib/action_view/render/partials.rb
- M actionpack/lib/action_view/template/error.rb
- M actionpack/lib/action_view/template/handler.rb
- M actionpack/lib/action_view/template/handlers.rb
- M actionpack/lib/action_view/template/handlers/builder.rb
- M actionpack/lib/action_view/template/handlers/erb.rb
- M actionpack/lib/action_view/template/handlers/rjs.rb
- M actionpack/lib/action_view/template/resolver.rb
- M actionpack/lib/action_view/template/text.rb
- M actionpack/lib/action_view/test_case.rb
- M actionpack/test/abstract/layouts_test.rb
- M actionpack/test/abstract/render_test.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/controller/action_pack_assertions_test.rb
- M actionpack/test/controller/base_test.rb
- M actionpack/test/controller/caching_test.rb
- M actionpack/test/controller/dispatcher_test.rb
- M actionpack/test/controller/helper_test.rb
- M actionpack/test/controller/layout_test.rb
- M actionpack/test/controller/mime_responds_test.rb
- M actionpack/test/controller/redirect_test.rb
- M actionpack/test/controller/render_other_test.rb
- M actionpack/test/controller/render_test.rb
- M actionpack/test/controller/render_xml_test.rb
- M actionpack/test/controller/resources_test.rb
- M actionpack/test/controller/routing_test.rb
- M actionpack/test/controller/test_test.rb
- M actionpack/test/controller/url_rewriter_test.rb
- M actionpack/test/controller/webservice_test.rb
- M actionpack/test/dispatch/request/multipart_params_parsing_test.rb
- M actionpack/test/dispatch/routing_test.rb
- M actionpack/test/lib/controller/fake_controllers.rb
- M actionpack/test/template/ajax_test.rb
- M actionpack/test/template/atom_feed_helper_test.rb
- M actionpack/test/template/render_test.rb
- M actionpack/test/template/test_case_test.rb
- M actionpack/test/template/url_helper_test.rb
- M activemodel/Rakefile
- M activemodel/lib/active_model.rb
- M activemodel/lib/active_model/attribute_methods.rb
- M activemodel/test/cases/helper.rb
- M activemodel/test/cases/tests_database.rb
- M activerecord/CHANGELOG
- M activerecord/lib/active_record.rb
- M activerecord/lib/active_record/associations.rb
- M activerecord/lib/active_record/base.rb
- M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
- M activerecord/test/cases/associations_test.rb
- M activerecord/test/cases/base_test.rb
- M activerecord/test/cases/helper.rb
- M activerecord/test/cases/migration_test.rb
- M activeresource/Rakefile
- M activeresource/lib/active_resource.rb
- M activeresource/test/abstract_unit.rb
- M activeresource/test/cases/base_test.rb
- M activesupport/CHANGELOG
- M activesupport/Rakefile
- M activesupport/lib/active_support.rb
- M activesupport/lib/active_support/core_ext/class/removal.rb
- M activesupport/lib/active_support/core_ext/date_time/conversions.rb
- M activesupport/lib/active_support/core_ext/enumerable.rb
- M activesupport/lib/active_support/core_ext/logger.rb
- M activesupport/lib/active_support/core_ext/object/extending.rb
- M activesupport/lib/active_support/core_ext/object/to_param.rb
- M activesupport/lib/active_support/core_ext/object/to_query.rb
- M activesupport/lib/active_support/core_ext/string/output_safety.rb
- M activesupport/lib/active_support/notifications.rb
- M activesupport/lib/active_support/testing/performance.rb
- M activesupport/lib/active_support/whiny_nil.rb
- M activesupport/test/core_ext/date_time_ext_test.rb
- M activesupport/test/core_ext/enumerable_test.rb
- M activesupport/test/core_ext/object/to_query_test.rb
- M activesupport/test/core_ext/time_with_zone_test.rb
- M activesupport/test/deprecation_test.rb
- M activesupport/test/notifications_test.rb
- M railties/Rakefile
- M railties/bin/rails
- M railties/lib/rails.rb
- M railties/lib/rails/application.rb
- M railties/lib/rails/commands/console.rb
- M railties/lib/rails/commands/dbconsole.rb
- M railties/lib/rails/commands/server.rb
- M railties/lib/rails/configuration.rb
- M railties/lib/rails/console_app.rb
- M railties/lib/rails/generators.rb
- M railties/lib/rails/generators/actions.rb
- M railties/lib/rails/generators/rails/app/app_generator.rb
- M railties/lib/rails/generators/rails/app/templates/Rakefile
- M railties/lib/rails/generators/rails/app/templates/config.ru
- M railties/lib/rails/generators/rails/app/templates/config/application.rb
- M railties/lib/rails/generators/rails/app/templates/config/environment.rb
- M railties/lib/rails/generators/rails/app/templates/config/routes.rb
- M railties/lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt
- M railties/lib/rails/generators/rails/plugin/templates/Rakefile
- M railties/lib/rails/generators/rails/resource/resource_generator.rb
- M railties/lib/rails/generators/rails/scaffold/USAGE
- M railties/lib/rails/initializable.rb
- M railties/lib/rails/initializer.rb
- M railties/lib/rails/plugin.rb
- M railties/lib/rails/rack/log_tailer.rb
- M railties/lib/rails/tasks.rb
- M railties/lib/rails/tasks/framework.rake
- M railties/lib/rails/tasks/misc.rake
- M railties/lib/rails/tasks/testing.rake
- M railties/lib/rails/test_help.rb
- M railties/test/application/configuration_test.rb
- M railties/test/application/generators_test.rb
- M railties/test/application/initializer_test.rb
- M railties/test/application/load_test.rb
- M railties/test/application/notifications_test.rb
- M railties/test/fixtures/plugins/engines/engine/config/routes.rb
- M railties/test/generators/actions_test.rb
- M railties/test/generators/resource_generator_test.rb
- M railties/test/generators/scaffold_generator_test.rb
- M railties/test/initializer/check_ruby_version_test.rb
- M railties/test/rails_info_controller_test.rb
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile »
<h2 style="font-size: 14px">Tickets have moved to Github</h2>
The new ticket tracker is available at <a href="https://github.com/rails/rails/issues">https://github.com/rails/rails/issues</a>