This project is archived and is in readonly mode.

Changeset [34f34e300980dfef0b8a8d4515ef84ce1f168417] by Jeremy Kemper

February 6th, 2009 @ 07:05 AM

Merge branch 'master' of git@github.com:rails/rails http://github.com/rails/rails/co...

Committed by Jeremy Kemper

  • M .gitignore
  • M actionmailer/CHANGELOG
  • M actionmailer/lib/action_mailer/base.rb
  • M actionmailer/test/mail_service_test.rb
  • M actionpack/CHANGELOG
  • M actionpack/lib/action_controller/dispatcher.rb
  • M actionpack/lib/action_controller/layout.rb
  • M actionpack/lib/action_controller/session/abstract_store.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/form_helper.rb
  • M actionpack/lib/action_view/helpers/url_helper.rb
  • M actionpack/lib/action_view/paths.rb
  • M actionpack/test/controller/render_test.rb
  • M actionpack/test/fixtures/test/render_implicit_js_template_without_layout.js.erb
  • M actionpack/test/template/form_helper_test.rb
  • M actionpack/test/template/url_helper_test.rb
  • M activerecord/CHANGELOG
  • M activerecord/lib/active_record/associations.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/connection_adapters/abstract/schema_definitions.rb
  • M activerecord/lib/active_record/nested_attributes.rb
  • M activerecord/lib/active_record/session_store.rb
  • M activerecord/lib/active_record/validations.rb
  • M activerecord/test/cases/attribute_methods_test.rb
  • M activerecord/test/cases/autosave_association_test.rb
  • M activerecord/test/cases/datatype_test_postgresql.rb
  • M activerecord/test/cases/finder_test.rb
  • M activerecord/test/cases/nested_attributes_test.rb
  • M activesupport/lib/active_support/inflector.rb
  • M railties/Rakefile
  • 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/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_logo_remix.gif
  • M railties/guides/images/rails_welcome.png
  • M railties/guides/images/ruby_guides_logo.gif
  • M railties/guides/images/ruby_on_rails_by_mike_rundle2.gif
  • 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/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/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/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/lib/commands/server.rb
  • M railties/lib/console_app.rb
  • M railties/lib/initializer.rb
  • M railties/lib/rails_generator/generators/components/scaffold/templates/controller.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/test/generators/rails_scaffold_generator_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>