Permalink
Commits on Oct 29, 2008
  1. More deletions

    wycats committed Oct 29, 2008
  2. Notice of new location

    wycats committed Oct 29, 2008
  3. Removes merb-core

    wycats committed Oct 29, 2008
Commits on Oct 13, 2008
  1. Fixed warning about STATUS_CODES due to 2 requires.

    David James committed with michaelklishin Oct 13, 2008
    Signed-off-by: Michael S. Klishin <michael@novemberain.com>
  2. Use pointers to frozen strings instead of creating new objects on eve…

    michaelklishin committed Oct 13, 2008
    …ry request (does not make sense everywhere though).
Commits on Oct 12, 2008
  1. Added Merb::Router.extensions as an official API.

    Carl Lerche committed Oct 12, 2008
    Merb::Router.extensions is now the official way to add functionality
    to the router.
  2. Resolved conflict, added a note on metaprogramming use in -core. Some…

    michaelklishin committed Oct 12, 2008
    …times it is appropriate.
  3. fixed specs for viewmatchers

    mholub committed with michaelklishin Oct 11, 2008
    Signed-off-by: Michael S. Klishin <michael@novemberain.com>
  4. Add warning when loading rexml instead of libxml-ruby

    mholub committed with michaelklishin Oct 11, 2008
    Signed-off-by: Michael S. Klishin <michael@novemberain.com>
  5. #329 bug fix

    mholub committed with michaelklishin Oct 11, 2008
    Signed-off-by: Michael S. Klishin <michael@novemberain.com>
  6. Since intention/option comment behind workers respawn in -k are not c…

    michaelklishin committed Oct 12, 2008
    …lear, do not let killing master with -k for now.
Commits on Oct 11, 2008
  1. Merge branch 'sprint'

    michaelklishin committed Oct 11, 2008
    * sprint:
      Updated GemManagement
  2. Updated GemManagement

    fabien committed Oct 11, 2008
  3. Merge branch 'sprint'

    wycats committed Oct 11, 2008
  4. remove the route method from specs

    Andy Delcambre committed Oct 11, 2008
  5. crap, stray non-comment

    Andy Delcambre committed Oct 11, 2008
  6. Revert "Move most merb logger code out, into extlib"

    Andy Delcambre committed Oct 11, 2008
    This reverts commit 7a73c14.
  7. Merge branch 'sprint'

    wycats committed Oct 11, 2008
  8. Fixes given again

    wycats committed Oct 11, 2008
  9. Merge commit 'mtodd/master'

    Andy Delcambre committed Oct 11, 2008
    Conflicts:
    	lib/merb-core/dispatch/router.rb
    	lib/merb-core/dispatch/router/behavior.rb
    	lib/merb-core/rack/helpers.rb