This project is archived and is in readonly mode.

Changeset [af1b48926f49226c934995c322ee017239158cf3] by Xavier Noria

April 23rd, 2011 @ 12:11 AM

Merge branch 'master' of git://github.com/lifo/docrails

Conflicts:

activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb

https://github.com/rails/rails/commit/af1b48926f49226c934995c322ee0...

Committed by Xavier Noria

  • M actionpack/lib/action_view/helpers/asset_tag_helper.rb
  • M actionpack/lib/action_view/helpers/asset_tag_helpers/javascript_tag_helpers.rb
  • M actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb
  • M actionpack/lib/action_view/helpers/record_tag_helper.rb
  • M actionpack/lib/action_view/helpers/url_helper.rb
  • M actionpack/test/template/sprockets_helper_test.rb
  • M activemodel/lib/active_model/observing.rb
  • M activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
  • M activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
  • M activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
  • M activesupport/lib/active_support/core_ext/object/inclusion.rb
  • M activesupport/lib/active_support/core_ext/object/try.rb
  • M railties/guides/source/active_record_querying.textile
  • M railties/guides/source/active_record_validations_callbacks.textile
  • M railties/guides/source/active_support_core_extensions.textile
  • M railties/guides/source/routing.textile
  • M railties/test/generators/assets_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>