This project is archived and is in readonly mode.

Changeset [c6612d2bb34e7104a7b1be0dedb0e1ad9596f160] by Xavier Noria

December 10th, 2010 @ 11:55 PM

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

Conflicts:

activerecord/lib/active_record/transactions.rb

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

Committed by Xavier Noria

  • M actionpack/lib/action_dispatch/routing/mapper.rb
  • M activemodel/lib/active_model/lint.rb
  • M activerecord/lib/active_record/transactions.rb
  • M railties/guides/source/action_controller_overview.textile
  • M railties/guides/source/active_record_querying.textile
  • M railties/guides/source/command_line.textile
  • M railties/guides/source/configuring.textile
  • M railties/guides/source/generators.textile
  • M railties/guides/source/routing.textile
  • M railties/guides/source/testing.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="https://github.com/rails/rails/issues">https://github.com/rails/rails/issues</a>