<?xml version="1.0" encoding="UTF-8"?>
<commits type="array">
  <commit>
    <parents type="array">
      <parent>
        <id>4b33fae1f52325d22083de2e83d827b924d1c616</id>
      </parent>
    </parents>
    <author>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </author>
    <url>http://github.com/lifo/docrails/commit/fcce1f17eaf9993b0210fe8e2a8117b61a1f0f69</url>
    <id>fcce1f17eaf9993b0210fe8e2a8117b61a1f0f69</id>
    <committed-date>2008-11-17T10:27:35-08:00</committed-date>
    <authored-date>2008-11-17T10:16:31-08:00</authored-date>
    <message>BACKWARDS INCOMPATIBLE: Renamed application.rb to application_controller.rb and removed all the special casing that was in place to support the former. You must do this rename in your own application when you upgrade to this version [DHH]</message>
    <tree>dcf89fab841f873dd9c26b3f061f7d1c4e378f86</tree>
    <committer>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>bfbf03ecee063adc9999c0dec50f8177594fb28f</id>
      </parent>
    </parents>
    <author>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </author>
    <url>http://github.com/lifo/docrails/commit/dc4eec1129520ce9863c9373d7cb79d8636ab7ca</url>
    <id>dc4eec1129520ce9863c9373d7cb79d8636ab7ca</id>
    <committed-date>2008-05-09T02:40:50-07:00</committed-date>
    <authored-date>2008-05-09T02:38:02-07:00</authored-date>
    <message>Merge docrails:

commit e6afd8b2736364322b673bbdcca3e9b38b6d3da0
Author: Xavier Noria &lt;fxn@hashref.com&gt;
Date:   Thu May 8 23:49:36 2008 +0200

    Overall documentation improvement and markup corrections. Zillion changes.

commit 2fead68b3192332eee27945ed95a94a64ca73f70
Author: Austin Putman &lt;austin@emmanuel.local&gt;
Date:   Wed May 7 19:35:46 2008 -0700

    Documented class methods on ActionController::Routing.  These are dangerous, and mostly used for testing.

commit f5b84182dbc39bea79c8ee319c688d00fa99f9d1
Author: Teflon Ted &lt;github@rudiment.net&gt;
Date:   Wed May 7 16:08:49 2008 -0400

    Added explanation about errant inflections not being patched in the future in order to avoid breaking legacy applications.

commit 370f4f51722cec49ace17093d29e9ce9e8f15cfb
Author: Sunny Ripert &lt;negatif@gmail.com&gt;
Date:   Wed May 7 14:00:59 2008 +0200

    Applied list conventions in AR::Base

commit 5bd18429f09d44e75191bec42a6db04bd33f3030
Author: Sunny Ripert &lt;negatif@gmail.com&gt;
Date:   Wed May 7 13:53:35 2008 +0200

    Renamed Options list to Attributes list whenever they weren't option hashes in AR::Base

commit d912bd5672316454457ae83f6e9dda5197beeb6f
Author: Yaroslav Markin &lt;yaroslav@markin.net&gt;
Date:   Wed May 7 13:50:28 2008 +0400

    Add a filter_parameter_logging usage hint to generated ApplicationController.
    This may help to remind the developer to filter sensitive information from application logs.
    Closes #11578

commit b243de0db3c2605121e055079854af5090d06374
Author: Jack Danger Canty &lt;git@6brand.com&gt;
Date:   Tue May 6 23:39:47 2008 -0700

    doc: disambiguating an example ActiveRecord class

commit f81d771f0657ae8375b84a77a059812cce5d6fd9
Author: Jack Danger Canty &lt;git@6brand.com&gt;
Date:   Tue May 6 23:35:05 2008 -0700

    doc: ActiveRecord::Reflection::AssociationReflection#through_reflection

    Added documentation demonstrating the use of #through_reflection for
    finding intervening reflection objects for HasManyThrough
    and HasOneThrough.

commit ae6b46f00b5b8b2939c6b37ce3329c83de7e71db
Author: Cheah Chu Yeow &lt;chuyeow@gmail.com&gt;
Date:   Wed May 7 13:47:41 2008 +0800

    Document AttributeAssignmentError and MultiparameterAssignmentErrors.

commit 8f463550b597db2156b67733f31aed13487fbc3a
Author: John Barnette &lt;jbarnette@gmail.com&gt;
Date:   Tue May 6 22:46:44 2008 -0700

    Killing/fixing a bunch of outdated language in the AR README.

commit aca44bcd92ef783abdf484b58abdde6786db0f89
Author: Cheah Chu Yeow &lt;chuyeow@gmail.com&gt;
Date:   Wed May 7 13:34:52 2008 +0800

    Make a note about ActiveResource::Timeouterror being raised when ARes calls timeout.

commit 284a930a93fbee16e25d06392779dbf2f03e9e12
Author: Jonathan Dance &lt;jd@wuputah.com&gt;
Date:   Tue May 6 14:58:26 2008 -0400

    improvements to the page caching docs

commit 9482da621390c874da7c921c8bd6230caae7035a
Author: Sunny Ripert &lt;negatif@gmail.com&gt;
Date:   Mon May 5 18:13:40 2008 +0200

    validates_numericality_of() &quot;integer&quot; option really is &quot;only_integer&quot;

commit e9afd6790a8f530528f6597a7f59bb283be754f6
Author: Sunny Ripert &lt;negatif@gmail.com&gt;
Date:   Mon May 5 12:11:59 2008 +0200

    Harmonized hash notation in AR::Base

commit 67ebf14a91ffd970b582be4ff2991d691a9cf3e1
Author: Sunny Ripert &lt;negatif@gmail.com&gt;
Date:   Mon May 5 12:06:19 2008 +0200

    Turned options into rdoc-lists in AR::Base

commit 0ec7c0a41d889d4e5382b9dff72f1aaba89bf297
Author: Marshall Huss &lt;mwhuss@Macbook.local&gt;
Date:   Sun May 4 23:21:33 2008 -0400

    Added information of how to set element_name in the case the user has a name confliction with an existing model

Signed-off-by: Pratik Naik &lt;pratiknaik@gmail.com&gt;</message>
    <tree>c7548000db7be1adb3b12ec5e6d3877d9262f979</tree>
    <committer>
      <name>Pratik Naik</name>
      <email>pratiknaik@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>bef071dd0b6b634c5e8e49d8c1b9daa0baa4136c</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/lifo/docrails/commit/3ba23348de4c7765b67e3715d2ab84c998bb1cea</url>
    <id>3ba23348de4c7765b67e3715d2ab84c998bb1cea</id>
    <committed-date>2007-10-29T14:40:23-07:00</committed-date>
    <authored-date>2007-10-29T14:40:23-07:00</authored-date>
    <message>Excise generated whitespace. Closes #10017 [Tim Pope]


git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8055 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>b162629f2cdba0db66ce1f05aad55ff8ab718e36</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>860cf2d44e01114af8ce83fffee3689df812a55c</id>
      </parent>
    </parents>
    <author>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </author>
    <url>http://github.com/lifo/docrails/commit/4af5dbbfccdc4f83b43b4acac246c5e0d8f9199c</url>
    <id>4af5dbbfccdc4f83b43b4acac246c5e0d8f9199c</id>
    <committed-date>2007-09-30T19:02:50-07:00</committed-date>
    <authored-date>2007-09-30T19:02:50-07:00</authored-date>
    <message>A set secret causes trouble with the cookie store

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7704 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>a0ae71e852d01992d129817fae148e724f2ec7b0</tree>
    <committer>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>c1bdf027d8d54127e41427e21fabe7ff3e26c6bc</id>
      </parent>
    </parents>
    <author>
      <name>Rick Olson</name>
      <email>technoweenie@gmail.com</email>
    </author>
    <url>http://github.com/lifo/docrails/commit/82ff27766d3edc3fb1d0d043841e9c3cd277744f</url>
    <id>82ff27766d3edc3fb1d0d043841e9c3cd277744f</id>
    <committed-date>2007-09-28T09:50:48-07:00</committed-date>
    <authored-date>2007-09-28T09:50:48-07:00</authored-date>
    <message>Better error messages if you leave out the :secret option for request forgery protection.  Closes #9670 [rick]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7671 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>7854659c7ec3f0ae5b87a8d1068f92a8fb40775c</tree>
    <committer>
      <name>Rick Olson</name>
      <email>technoweenie@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>959a1fc22dad10726c34d8fc03c8e0985ae0db9e</id>
      </parent>
    </parents>
    <author>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </author>
    <url>http://github.com/lifo/docrails/commit/eca3b790b5aaa92cc563dfed095feffda150c09e</url>
    <id>eca3b790b5aaa92cc563dfed095feffda150c09e</id>
    <committed-date>2007-09-24T15:52:35-07:00</committed-date>
    <authored-date>2007-09-24T15:52:35-07:00</authored-date>
    <message>Give a pointer on where to look for more

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7620 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>b10557e164048e767f522cc39fb86a69107dd62a</tree>
    <committer>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>fc042435a6f571684314d60e9605e3331b7435f9</id>
      </parent>
    </parents>
    <author>
      <name>Rick Olson</name>
      <email>technoweenie@gmail.com</email>
    </author>
    <url>http://github.com/lifo/docrails/commit/605aadb3cdba9f469e88c39c0cad7448d59a9f0c</url>
    <id>605aadb3cdba9f469e88c39c0cad7448d59a9f0c</id>
    <committed-date>2007-09-24T11:11:59-07:00</committed-date>
    <authored-date>2007-09-24T11:11:59-07:00</authored-date>
    <message>protect new rails apps from csrf by default.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7616 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>b7558f2616b37ae46836486ba4a5cae838c9c239</tree>
    <committer>
      <name>Rick Olson</name>
      <email>technoweenie@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>f95dfff966696cba237723e4abfefd3ae8ca91cb</id>
      </parent>
    </parents>
    <author>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </author>
    <url>http://github.com/lifo/docrails/commit/08a533645eb2bb15aeb91528c3c01ea6fc742569</url>
    <id>08a533645eb2bb15aeb91528c3c01ea6fc742569</id>
    <committed-date>2007-02-24T12:33:47-08:00</committed-date>
    <authored-date>2007-02-24T12:33:47-08:00</authored-date>
    <message>Make it a default assumption that you want all helpers, all the time (yeah, yeah)

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6222 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>d0741def41aba059a1521cb1fcc045fa3fc2cd33</tree>
    <committer>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>45dd256889cddd1a1746d122344a966873e03921</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/lifo/docrails/commit/5a1251dc2df7a3a1e4d6fec2e9085a464543ff50</url>
    <id>5a1251dc2df7a3a1e4d6fec2e9085a464543ff50</id>
    <committed-date>2007-02-21T16:57:02-08:00</committed-date>
    <authored-date>2007-02-21T16:57:02-08:00</authored-date>
    <message>Session configuration in config/environment.rb instead of app/controllers/application.rb

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6198 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>d76efdb32d7074db5fea8c9298838ce78f0bf8da</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>25bb98e42daa98c4207ea19bb80525d2b7cf8962</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/lifo/docrails/commit/45dd256889cddd1a1746d122344a966873e03921</url>
    <id>45dd256889cddd1a1746d122344a966873e03921</id>
    <committed-date>2007-02-21T15:13:32-08:00</committed-date>
    <authored-date>2007-02-21T15:13:32-08:00</authored-date>
    <message>Missed commit for [6184]. Generate a random secret for new app's cookie session store.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6197 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>ce412dd499f3880fea2f6f265431809380b7929a</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>d22f9c948859827f170b9a93820bf06aa720743c</id>
      </parent>
    </parents>
    <author>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </author>
    <url>http://github.com/lifo/docrails/commit/fa207c24468b3b7c32b3c6d7128ec13a7b7d4a16</url>
    <id>fa207c24468b3b7c32b3c6d7128ec13a7b7d4a16</id>
    <committed-date>2006-05-21T09:51:46-07:00</committed-date>
    <authored-date>2006-05-21T09:51:46-07:00</authored-date>
    <message>Disabling sessions is not a common day event

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4352 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>2315a93034be6043c75bdda0a5aa9aee52753dfe</tree>
    <committer>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>d08d89c09285ac6c65273c935a1afbbc983f7544</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/lifo/docrails/commit/0adcd811f945603a8037febaa158bbc1ffaba9d1</url>
    <id>0adcd811f945603a8037febaa158bbc1ffaba9d1</id>
    <committed-date>2006-05-07T01:28:42-07:00</committed-date>
    <authored-date>2006-05-07T01:28:42-07:00</authored-date>
    <message>The app generator sets a session key in application.rb so apps running on the same host may distinguish their cookies. Closes #2967.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4328 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>81cfd5568be550302c60b076b29314d5e59db688</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>04f4ae255f5f9d0b6ed1f131473f56806a1430ef</id>
      </parent>
    </parents>
    <author>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </author>
    <url>http://github.com/lifo/docrails/commit/6027d376b9e68a41f9b3da5abd21087fd965c421</url>
    <id>6027d376b9e68a41f9b3da5abd21087fd965c421</id>
    <committed-date>2005-10-14T18:10:12-07:00</committed-date>
    <authored-date>2005-10-14T18:10:12-07:00</authored-date>
    <message>Cleaned up some docs

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2598 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>5c1a0408c6dc0c0698a8ae966044b916e2f79f49</tree>
    <committer>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>a02a96226e08557ba6abf70fa80168fe512b8f93</id>
      </parent>
    </parents>
    <author>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </author>
    <url>http://github.com/lifo/docrails/commit/4d9cda5732538e9cdb325b2ffa7f9e97f8ac2ec0</url>
    <id>4d9cda5732538e9cdb325b2ffa7f9e97f8ac2ec0</id>
    <committed-date>2004-12-15T03:30:09-08:00</committed-date>
    <authored-date>2004-12-15T03:30:09-08:00</authored-date>
    <message>Renamed AbstractApplicationController and abstract_application.rb to ApplicationController and application.rb, so that it will be possible for the framework to automatically pick up on app/views/layouts/application.rhtml and app/helpers/application.rb

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@159 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>b00a149a047e97b978be9bcbcfe5b9e4b02ec0d5</tree>
    <committer>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </committer>
  </commit>
</commits>
