<?xml version="1.0" encoding="UTF-8"?>
<commits type="array">
  <commit>
    <parents type="array">
      <parent>
        <id>a196747d7774d0e260689ab51f80cb6b87d2db1f</id>
      </parent>
    </parents>
    <author>
      <name>Yehuda Katz</name>
      <email>wycats@gmail.com</email>
    </author>
    <url>http://github.com/wycats/merb/commit/05e4f577f2bceffa7ddefbf62208ade9dd06e797</url>
    <id>05e4f577f2bceffa7ddefbf62208ade9dd06e797</id>
    <committed-date>2008-12-02T17:20:26-08:00</committed-date>
    <authored-date>2008-12-02T17:20:26-08:00</authored-date>
    <message>Adds merb-core/two-oh.rb to resolve #1025:
* Required back-compat breakage
* multipart_post and multipart_put now takes three parameters
  * path
  * params (values can be Files or IOs)
  * env: the same env that you would pass into #request
* multipart_post returns the same object that #request returns
* require &quot;merb-core/two-oh&quot; to activate these features</message>
    <tree>0348d3571815c0b9e41b0ad8f9ee811442372fb2</tree>
    <committer>
      <name>Yehuda Katz</name>
      <email>wycats@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>68da4cca70ac5680d09e5c0700affb10878a000f</id>
      </parent>
    </parents>
    <author>
      <name>Carl Lerche</name>
      <email>carllerche@mac.com</email>
    </author>
    <url>http://github.com/wycats/merb/commit/0a02b7ae0c6e21ddf4af09e6cb9ef2c808869343</url>
    <id>0a02b7ae0c6e21ddf4af09e6cb9ef2c808869343</id>
    <committed-date>2008-11-24T16:39:04-08:00</committed-date>
    <authored-date>2008-11-24T14:47:10-08:00</authored-date>
    <message>Resolves #1022 - Cookie Jar not joining cookies correctly

The Request helper cookie jar was not joining multiple cookies for
a single request correctly using a semicolon. This patch fixes this
problem.</message>
    <tree>5754e1d508aa5deab083334ccd89d2064b43cf53</tree>
    <committer>
      <name>Carl Lerche</name>
      <email>carllerche@mac.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>7a5a6b6970bb4cefecbb52ec2cb88e5948281ff0</id>
      </parent>
    </parents>
    <author>
      <name>Yehuda Katz</name>
      <email>wycats@gmail.com</email>
    </author>
    <url>http://github.com/wycats/merb/commit/aa5963504feb82e9ebdcdba9c0468e3da7869e0e</url>
    <id>aa5963504feb82e9ebdcdba9c0468e3da7869e0e</id>
    <committed-date>2008-11-22T21:44:08-08:00</committed-date>
    <authored-date>2008-11-22T21:44:08-08:00</authored-date>
    <message>Raise an error if a controller tries to override a non-overridable method on Merb::Controller.</message>
    <tree>c906817b7a609d47a12344dfacf93bcfc092eb69</tree>
    <committer>
      <name>Yehuda Katz</name>
      <email>wycats@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>aa16b61d61499606b54c19b529c18089122bd305</id>
      </parent>
    </parents>
    <author>
      <name>Carl Lerche</name>
      <email>carllerche@mac.com</email>
    </author>
    <url>http://github.com/wycats/merb/commit/de93f6d6c8c1ad45fdd7ab330ab5b4d0bf3bf3b1</url>
    <id>de93f6d6c8c1ad45fdd7ab330ab5b4d0bf3bf3b1</id>
    <committed-date>2008-11-03T13:56:05-08:00</committed-date>
    <authored-date>2008-11-02T19:58:06-08:00</authored-date>
    <message>Convert view matchers to nokogiri with a rexml fallback

The view matchers have_xpath, have_selector, have_tag, matches_tag now
use nokogiri. If nokogiri is not present (for example, in situations
where it cannot be compiled), the matchers fallback on rexml.</message>
    <tree>0627f1d405f132ed2bc178bc69125e908222f64a</tree>
    <committer>
      <name>Carl Lerche</name>
      <email>carllerche@mac.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>d75531214efcf8e83fc5ef20f73039298ae635e0</id>
      </parent>
    </parents>
    <author>
      <name>Carl Lerche</name>
      <email>carllerche@mac.com</email>
    </author>
    <url>http://github.com/wycats/merb/commit/b2b5c67d557549415f646a6a26360dd1fdd16cbb</url>
    <id>b2b5c67d557549415f646a6a26360dd1fdd16cbb</id>
    <committed-date>2008-10-29T14:01:44-07:00</committed-date>
    <authored-date>2008-10-28T23:10:50-07:00</authored-date>
    <message>Finished the rest of the specs and got everything to work</message>
    <tree>77e8d31a58e11c7bfd0ceba70b55a46ae86f87b1</tree>
    <committer>
      <name>Yehuda Katz</name>
      <email>wycats@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>c1b3ec4a91f828fc366a452926c05ad162714d13</id>
      </parent>
    </parents>
    <author>
      <name>Carl Lerche</name>
      <email>carllerche@mac.com</email>
    </author>
    <url>http://github.com/wycats/merb/commit/d75531214efcf8e83fc5ef20f73039298ae635e0</url>
    <id>d75531214efcf8e83fc5ef20f73039298ae635e0</id>
    <committed-date>2008-10-29T14:01:44-07:00</committed-date>
    <authored-date>2008-10-28T19:33:21-07:00</authored-date>
    <message>Starting to build cookie tracking for the #request spec helper</message>
    <tree>da924bbd1156033a6d96cedc10540ea07f6941ba</tree>
    <committer>
      <name>Yehuda Katz</name>
      <email>wycats@gmail.com</email>
    </committer>
  </commit>
  <commit>
    <parents type="array">
      <parent>
        <id>72f7c7ef3a2ce6a0a0f409b2092e64da7d0795cf</id>
      </parent>
    </parents>
    <author>
      <name>Andy Delcambre</name>
      <email>adelcambre@engineyard.com</email>
    </author>
    <url>http://github.com/wycats/merb/commit/f4c5064cafa1df34b8b71171871051f6ddccf941</url>
    <id>f4c5064cafa1df34b8b71171871051f6ddccf941</id>
    <committed-date>2008-10-12T19:17:19-07:00</committed-date>
    <authored-date>2008-10-12T19:17:19-07:00</authored-date>
    <message>Moving merb-core into a merb-core subdirectory.</message>
    <tree>27d6e3d13eff340febe423f3d1f2d3213ba27927</tree>
    <committer>
      <name>Andy Delcambre</name>
      <email>adelcambre@engineyard.com</email>
    </committer>
  </commit>
</commits>
