<?xml version="1.0" encoding="UTF-8"?>
<commits type="array">
  <commit>
    <parents type="array">
      <parent>
        <id>a134f8f3c8c2270c8d8e3f9d087184d5959784f9</id>
      </parent>
    </parents>
    <author>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/478cd8223c5ef43abbbb347c5517910a5ab91b67</url>
    <id>478cd8223c5ef43abbbb347c5517910a5ab91b67</id>
    <committed-date>2007-10-04T21:11:29-07:00</committed-date>
    <authored-date>2007-10-04T21:11:29-07:00</authored-date>
    <message>Tagged 1.2.4 for release

git-svn-id: http://svn-commit.rubyonrails.org/rails/tags/rel_1-2-4@7741 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>05aa619c38bd0558e7b24ad2befeb1539cb46bda</tree>
    <committer>
      <name>David Heinemeier Hansson</name>
      <email>david@loudthinking.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>0a2404f5cc92c30532465713c4979e3417e8090d</id>
      </parent>
    </parents>
    <author>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/a134f8f3c8c2270c8d8e3f9d087184d5959784f9</url>
    <id>a134f8f3c8c2270c8d8e3f9d087184d5959784f9</id>
    <committed-date>2007-10-03T21:11:51-07:00</committed-date>
    <authored-date>2007-10-03T21:11:51-07:00</authored-date>
    <message>Actually add the file referenced in [7730]


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7737 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>845794048f2dd244b661c04e3b37f35cf5708220</tree>
    <committer>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>70a8e6a7d11d53ff9af2f59b837037b7a9449ffd</id>
      </parent>
    </parents>
    <author>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/0a2404f5cc92c30532465713c4979e3417e8090d</url>
    <id>0a2404f5cc92c30532465713c4979e3417e8090d</id>
    <committed-date>2007-10-03T14:48:43-07:00</committed-date>
    <authored-date>2007-10-03T14:48:43-07:00</authored-date>
    <message>Merge rake routes to stable to help people upgrading.


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7730 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>e2e8df2eb0319364b19882cdbe6b61fafebf0622</tree>
    <committer>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>6c773706b44c4fe584e4e1ff563e789231df76c4</id>
      </parent>
    </parents>
    <author>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/70a8e6a7d11d53ff9af2f59b837037b7a9449ffd</url>
    <id>70a8e6a7d11d53ff9af2f59b837037b7a9449ffd</id>
    <committed-date>2007-10-01T22:52:16-07:00</committed-date>
    <authored-date>2007-10-01T22:52:16-07:00</authored-date>
    <message>Forgotten changelog entry


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7721 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>48a5519437b178ac42674ef2fa902b977b2208a6</tree>
    <committer>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>779db44f74066a4794d0ea83c1f87cb2e3e80cb1</id>
      </parent>
    </parents>
    <author>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/6c773706b44c4fe584e4e1ff563e789231df76c4</url>
    <id>6c773706b44c4fe584e4e1ff563e789231df76c4</id>
    <committed-date>2007-10-01T22:51:51-07:00</committed-date>
    <authored-date>2007-10-01T22:51:51-07:00</authored-date>
    <message>Disable non-cookie sessions to prevent Session Fixation Attacks.  Closes #7952 [bradediger]


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7720 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>a634a95dea32b27367ad2f011c026d3eca9f8a76</tree>
    <committer>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>a11dc682a99b1eac547ca5a9bab36f58b7565a38</id>
      </parent>
    </parents>
    <author>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/779db44f74066a4794d0ea83c1f87cb2e3e80cb1</url>
    <id>779db44f74066a4794d0ea83c1f87cb2e3e80cb1</id>
    <committed-date>2007-09-30T23:44:07-07:00</committed-date>
    <authored-date>2007-09-30T23:44:07-07:00</authored-date>
    <message>Change the resource seperator from ; to / change the generated routes to use the new-style named routes.  e.g.  new_group_user_path(@group) instead of group_new_user_path(@group). [pixeltrix] Closes #8558


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7713 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>401d83ebc406dbd1f2304a5c53712613fb395ba1</tree>
    <committer>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>fe1ee81d1a2bef19680250a692465eed55d6f837</id>
      </parent>
    </parents>
    <author>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/a11dc682a99b1eac547ca5a9bab36f58b7565a38</url>
    <id>a11dc682a99b1eac547ca5a9bab36f58b7565a38</id>
    <committed-date>2007-09-30T19:14:31-07:00</committed-date>
    <authored-date>2007-09-30T19:14:31-07:00</authored-date>
    <message>Merge sqlite test fixes from trunk


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7706 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>358c22e505c1353d018f503bc58add5062729dc7</tree>
    <committer>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>8943da41fd8c81bb565e46be3bc5ad350d40dab9</id>
      </parent>
    </parents>
    <author>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/fe1ee81d1a2bef19680250a692465eed55d6f837</url>
    <id>fe1ee81d1a2bef19680250a692465eed55d6f837</id>
    <committed-date>2007-09-30T18:56:25-07:00</committed-date>
    <authored-date>2007-09-30T18:56:25-07:00</authored-date>
    <message>Silence mocha warnings


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7703 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>e1e3461e93336a8c5d206a68f5c7a334ed6e7832</tree>
    <committer>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>3acd2bd7210dd1164a8f07cd4667032d5d5a392a</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/8943da41fd8c81bb565e46be3bc5ad350d40dab9</url>
    <id>8943da41fd8c81bb565e46be3bc5ad350d40dab9</id>
    <committed-date>2007-09-23T15:03:09-07:00</committed-date>
    <authored-date>2007-09-23T15:03:09-07:00</authored-date>
    <message>Revert [7414] which rearranged stable resource URLs. References #8558.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7600 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>5e4fa0385e5b1ef65452d967b1a9e8d64d46119d</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>19dff148149e9679b4d9f46cf8774a0b2d77b0a7</id>
      </parent>
    </parents>
    <author>
      <name>Tobias L&#252;tke</name>
      <email>tobias.luetke@gmail.com</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/3acd2bd7210dd1164a8f07cd4667032d5d5a392a</url>
    <id>3acd2bd7210dd1164a8f07cd4667032d5d5a392a</id>
    <committed-date>2007-09-06T07:26:52-07:00</committed-date>
    <authored-date>2007-09-06T07:26:52-07:00</authored-date>
    <message>Added new new_admin_products_url named route in addition to old admin_new_products_url syntax. latter syntax got a deprecation warning [pixeltrix]



git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7414 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>9b4e640ed571c5f6e10934626bcd4d9451b37a77</tree>
    <committer>
      <name>Tobias L&#252;tke</name>
      <email>tobias.luetke@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>1dd00341342e0cc6e2474bce82664f5b740fb261</id>
      </parent>
    </parents>
    <author>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/19dff148149e9679b4d9f46cf8774a0b2d77b0a7</url>
    <id>19dff148149e9679b4d9f46cf8774a0b2d77b0a7</id>
    <committed-date>2007-08-19T21:26:10-07:00</committed-date>
    <authored-date>2007-08-19T21:26:10-07:00</authored-date>
    <message>Merge 8801 fix to stable. Closes #8801


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7347 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>5e4fa0385e5b1ef65452d967b1a9e8d64d46119d</tree>
    <committer>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>e0fd18b2aaccbffdc52a1d05b2580b7c38219355</id>
      </parent>
    </parents>
    <author>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/1dd00341342e0cc6e2474bce82664f5b740fb261</url>
    <id>1dd00341342e0cc6e2474bce82664f5b740fb261</id>
    <committed-date>2007-08-15T21:58:45-07:00</committed-date>
    <authored-date>2007-08-15T21:58:45-07:00</authored-date>
    <message>Don't clobber :includes passed to count on has_many association. Closes #9175 [danger]



git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7328 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>bd0f776c1ca86c1674af932c04ecd6a12f6b0b79</tree>
    <committer>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>2503fd3c3a53974ce4550679b4c6f6b5304ea9f8</id>
      </parent>
    </parents>
    <author>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/e0fd18b2aaccbffdc52a1d05b2580b7c38219355</url>
    <id>e0fd18b2aaccbffdc52a1d05b2580b7c38219355</id>
    <committed-date>2007-08-15T21:58:06-07:00</committed-date>
    <authored-date>2007-08-15T21:58:06-07:00</authored-date>
    <message>Merge [7235] to stable. References #9167 [danger]


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7327 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>e5b89b86c28c8ddc21711b40a3f7aabbfc447400</tree>
    <committer>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>631bf6b203be4d1d8ab0dac6792117aef2f96f8b</id>
      </parent>
    </parents>
    <author>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/2503fd3c3a53974ce4550679b4c6f6b5304ea9f8</url>
    <id>2503fd3c3a53974ce4550679b4c6f6b5304ea9f8</id>
    <committed-date>2007-08-14T22:35:22-07:00</committed-date>
    <authored-date>2007-08-14T22:35:22-07:00</authored-date>
    <message>Ensure TestRequest#request_uri returns the right value when doing multiple GETs. Closes #4867 [alisdair@randomoracle.org, mpalmer]


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7320 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>30a5ff6be4e2e2406a1416d9c8a2d542e88f0b0e</tree>
    <committer>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>6cc01c9579348cb40deda44c5ab2f31928a229a4</id>
      </parent>
    </parents>
    <author>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/631bf6b203be4d1d8ab0dac6792117aef2f96f8b</url>
    <id>631bf6b203be4d1d8ab0dac6792117aef2f96f8b</id>
    <committed-date>2007-08-14T20:57:17-07:00</committed-date>
    <authored-date>2007-08-14T20:57:17-07:00</authored-date>
    <message>Integration tests: introduce methods for other HTTP methods. Closes #6353.  Merges [6203]


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7319 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>0342ea99419e57c80ff92ee1c20c2680b00731b5</tree>
    <committer>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>e3670a0e24e56ade594f4f82a67e573e96f6e97d</id>
      </parent>
    </parents>
    <author>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/6cc01c9579348cb40deda44c5ab2f31928a229a4</url>
    <id>6cc01c9579348cb40deda44c5ab2f31928a229a4</id>
    <committed-date>2007-08-04T18:37:43-07:00</committed-date>
    <authored-date>2007-08-04T18:37:43-07:00</authored-date>
    <message>Merge gem freezing fix to stable.


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7277 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>87e0235a763e2de6a431b4b8826d8d843c1da777</tree>
    <committer>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>40a188b18e9c1155f417b5922850c516e4643e7e</id>
      </parent>
    </parents>
    <author>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/e3670a0e24e56ade594f4f82a67e573e96f6e97d</url>
    <id>e3670a0e24e56ade594f4f82a67e573e96f6e97d</id>
    <committed-date>2007-07-14T01:53:32-07:00</committed-date>
    <authored-date>2007-07-14T01:53:32-07:00</authored-date>
    <message>Improve performance of action caching. Closes #8231 [skaes]



git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7185 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>79f1f2e2b1df388a735d839c5c565c5522bc95cb</tree>
    <committer>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>d81ac8d6f30fa8a277c60a80a8d81e34de51b61b</id>
      </parent>
    </parents>
    <author>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/40a188b18e9c1155f417b5922850c516e4643e7e</url>
    <id>40a188b18e9c1155f417b5922850c516e4643e7e</id>
    <committed-date>2007-07-10T19:39:31-07:00</committed-date>
    <authored-date>2007-07-10T19:39:31-07:00</authored-date>
    <message>Merge [7177] to release. [skaes] References #8891


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7178 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>e9d05abb0842000067cb81f9da1402588bc601f8</tree>
    <committer>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>b29caa54e61cccfc330d47bbe5839970c94bb36e</id>
      </parent>
    </parents>
    <author>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/d81ac8d6f30fa8a277c60a80a8d81e34de51b61b</url>
    <id>d81ac8d6f30fa8a277c60a80a8d81e34de51b61b</id>
    <committed-date>2007-07-01T16:35:07-07:00</committed-date>
    <authored-date>2007-07-01T16:35:07-07:00</authored-date>
    <message>Merge delete-with-options for cookies from trunk to release


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7161 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>2a179a43d145b004564d8fa50b9a84c7a9cb23dd</tree>
    <committer>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>7d517a145bebe3617f4a117e3685394396598182</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/b29caa54e61cccfc330d47bbe5839970c94bb36e</url>
    <id>b29caa54e61cccfc330d47bbe5839970c94bb36e</id>
    <committed-date>2007-06-22T17:43:11-07:00</committed-date>
    <authored-date>2007-06-22T17:43:11-07:00</authored-date>
    <message>Merge [7086] to stable: demote Hash#to_xml to use XmlSimple#xml_in_string so it can't read files or stdin. References #8453.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7087 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>3e87f759fdce5bf93c884586ffae1377d5e21057</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>2ba886478206dd5e55d910031a3f886e11e52943</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/7d517a145bebe3617f4a117e3685394396598182</url>
    <id>7d517a145bebe3617f4a117e3685394396598182</id>
    <committed-date>2007-06-21T13:50:53-07:00</committed-date>
    <authored-date>2007-06-21T13:50:53-07:00</authored-date>
    <message>Merge [7075] to stable: save associated records only if the association is already loaded. References #8713.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7076 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>6d8cdd7318fbd6e5480e8b00b78ffddb68992064</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>5c6a0d57acd2c77a8ae307a8647d7fb1c59faaad</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/2ba886478206dd5e55d910031a3f886e11e52943</url>
    <id>2ba886478206dd5e55d910031a3f886e11e52943</id>
    <committed-date>2007-06-12T18:26:36-07:00</committed-date>
    <authored-date>2007-06-12T18:26:36-07:00</authored-date>
    <message>1-2-stable: changing the :default Date format doesn't break date quoting. Closes #6312.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7012 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>ee4297959b3e8b75230421c2c90964b7c4111178</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>74191edb22d69902efff5bde3eb7cdf5544bc3e6</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/5c6a0d57acd2c77a8ae307a8647d7fb1c59faaad</url>
    <id>5c6a0d57acd2c77a8ae307a8647d7fb1c59faaad</id>
    <committed-date>2007-06-12T09:47:18-07:00</committed-date>
    <authored-date>2007-06-12T09:47:18-07:00</authored-date>
    <message>Merge [7006] to stable: fix precedence error in failsafe rescue. References #8625.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7007 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>f0b96650b32d2c6dd16bd5c6b52ec5c5ca9a7ef0</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>9c0e4de88b92ace4ab6a156f631eecfc83770e85</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/74191edb22d69902efff5bde3eb7cdf5544bc3e6</url>
    <id>74191edb22d69902efff5bde3eb7cdf5544bc3e6</id>
    <committed-date>2007-06-11T11:06:29-07:00</committed-date>
    <authored-date>2007-06-11T11:06:29-07:00</authored-date>
    <message>Merge [7002] to stable: fix syntax error in dispatcher than wrecked failsafe responses. References #8625.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7003 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>b80721d6df78f6fc18d49c69e38645220ffa3062</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>1f5a26432da569d0a2f8de87cf7aa36cd0c789e4</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/9c0e4de88b92ace4ab6a156f631eecfc83770e85</url>
    <id>9c0e4de88b92ace4ab6a156f631eecfc83770e85</id>
    <committed-date>2007-06-10T18:01:32-07:00</committed-date>
    <authored-date>2007-06-10T18:01:32-07:00</authored-date>
    <message>Deprecate pagination for Rails 1.2.4. Install the classic_pagination plugin for forward compatibility, or move to the superior will_paginate plugin. References #8157.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6993 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>c21394e1f920056bb69191739e161c77155e8dd0</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>d5950cdd57d1a5c81587b429d176d6436db6845c</id>
      </parent>
    </parents>
    <author>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/1f5a26432da569d0a2f8de87cf7aa36cd0c789e4</url>
    <id>1f5a26432da569d0a2f8de87cf7aa36cd0c789e4</id>
    <committed-date>2007-05-29T02:58:29-07:00</committed-date>
    <authored-date>2007-05-29T02:58:29-07:00</authored-date>
    <message>Fix template compile tests on windows [skaes] closes #8234


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6895 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>35db20639c7ba9ab36a396140fd5598083a8cd50</tree>
    <committer>
      <name>Michael Koziarski</name>
      <email>michael@koziarski.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>fe3fefeeecc62c9c76d436ce4c42c0826d39ab75</id>
      </parent>
    </parents>
    <author>
      <name>Rick Olson</name>
      <email>technoweenie@gmail.com</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/d5950cdd57d1a5c81587b429d176d6436db6845c</url>
    <id>d5950cdd57d1a5c81587b429d176d6436db6845c</id>
    <committed-date>2007-05-28T08:54:39-07:00</committed-date>
    <authored-date>2007-05-28T08:54:39-07:00</authored-date>
    <message>apply [6879] to stable. Closes #7293.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6880 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>45bb158510de8d98de18eb4e3f02d123aa7d8524</tree>
    <committer>
      <name>Rick Olson</name>
      <email>technoweenie@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>3ad1a9855685b11d1a6c4e78354a23ff125729d9</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/fe3fefeeecc62c9c76d436ce4c42c0826d39ab75</url>
    <id>fe3fefeeecc62c9c76d436ce4c42c0826d39ab75</id>
    <committed-date>2007-05-27T15:21:20-07:00</committed-date>
    <authored-date>2007-05-27T15:21:20-07:00</authored-date>
    <message>Add Active Resource to rails:freeze:edge and drop Action Web Service. Closes #8205.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6872 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>4e11be6ae25859203c18b0aaadee2da472f0b58e</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>099c20653556a6d795f1a143fa2d91a17e8a7830</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/3ad1a9855685b11d1a6c4e78354a23ff125729d9</url>
    <id>3ad1a9855685b11d1a6c4e78354a23ff125729d9</id>
    <committed-date>2007-05-21T20:41:29-07:00</committed-date>
    <authored-date>2007-05-21T20:41:29-07:00</authored-date>
    <message>Merge [6804] to stable: belongs_to assignment creates a new proxy rather than modifying its target in-place. References #8412.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6805 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>2daee3df654a97203b16f638d9746554fd5eeea8</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>e5590d69e59ee95cd4c13830f1312cdbaf758794</id>
      </parent>
    </parents>
    <author>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </author>
    <url>http://github.com/lukemelia/rails/commit/099c20653556a6d795f1a143fa2d91a17e8a7830</url>
    <id>099c20653556a6d795f1a143fa2d91a17e8a7830</id>
    <committed-date>2007-05-21T16:04:14-07:00</committed-date>
    <authored-date>2007-05-21T16:04:14-07:00</authored-date>
    <message>Merge [6802] to stable: fix filtered parameter logging with nil parameter values. References #8422.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6803 5ecf4fe2-1ee6-0310-87b1-e25e094e27de</message>
    <tree>ee07110f23eb44638cf68abd33c5caa736cea2f9</tree>
    <committer>
      <name>Jeremy Kemper</name>
      <email>jeremy@bitsweat.net</email>
    </committer>
  </commit>
</commits>
