This project is archived and is in readonly mode.

Changeset [9cee693213e0205cb5992728bb516215e34cb79f] by Aaron Patterson

March 7th, 2011 @ 04:50 PM

Merge branch 'master' of

  • 'master' of (44 commits) Fixed indentation in actionmailer base_test [#6538 state:committed] remove unused assigned variable removes merge conflicts removes Examples headers introduced in 9b96de6 Revert "Fixed identation in actionmailer base_test" Report the correct value of in the exception message as different ruby implementations may have different values, for example Rubinius returns 53 for Improve testing of cookies in functional tests: - cookies can be set using string or symbol keys - cookies are preserved across calls to get, post, etc. - cookie names and values are escaped - cookies can be cleared using @request.cookies.clear more style changes Some style changes style changes Revert "style changes" Raise ArgumentError if route name is invalid [#6517 state:resolved] style changes Allow model to be inherited from Hash [#6487 state:resolved] styles applied for usage added failing test for fields_for with a record object that inherits from Hash Fixed identation in actionmailer base_test wrong SQL statement commas to set off expressions that interrupt sentence flow typo changes ...

Committed by Aaron Patterson

  • M actionmailer/lib/rails/generators/mailer/USAGE
  • M actionmailer/test/base_test.rb
  • M actionpack/lib/action_controller/test_case.rb
  • M actionpack/lib/action_dispatch/routing/route_set.rb
  • M actionpack/lib/action_dispatch/testing/test_process.rb
  • M actionpack/lib/action_dispatch/testing/test_request.rb
  • M actionpack/lib/action_view/helpers/form_helper.rb
  • M actionpack/test/dispatch/cookies_test.rb
  • M actionpack/test/dispatch/routing_test.rb
  • M actionpack/test/dispatch/test_request_test.rb
  • M actionpack/test/template/form_options_helper_test.rb
  • M activemodel/lib/active_model/observing.rb
  • M activesupport/lib/active_support/backtrace_cleaner.rb
  • M activesupport/lib/active_support/configurable.rb
  • M activesupport/lib/active_support/hash_with_indifferent_access.rb
  • M activesupport/lib/active_support/i18n_railtie.rb
  • M activesupport/lib/active_support/log_subscriber.rb
  • M activesupport/lib/active_support/message_encryptor.rb
  • M activesupport/lib/active_support/message_verifier.rb
  • M activesupport/lib/active_support/whiny_nil.rb
  • M activesupport/test/whiny_nil_test.rb
  • M railties/guides/source/active_record_querying.textile
  • M railties/guides/source/contributing_to_ruby_on_rails.textile

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=""></a>