Permalink
Commits on Oct 29, 2008
  1. More deletions

    committed Oct 29, 2008
  2. Notice of new location

    committed Oct 29, 2008
  3. Removes merb-core

    committed Oct 29, 2008
Commits on Oct 13, 2008
  1. @michaelklishin

    Fixed warning about STATUS_CODES due to 2 requires.

    Signed-off-by: Michael S. Klishin <michael@novemberain.com>
    David James committed with michaelklishin Oct 13, 2008
  2. @michaelklishin

    Use pointers to frozen strings instead of creating new objects on eve…

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

    Merb::Router.extensions is now the official way to add functionality
    to the router.
    Carl Lerche committed Oct 12, 2008
  2. @michaelklishin
  3. @michaelklishin
  4. @michaelklishin

    Resolved conflict, added a note on metaprogramming use in -core. Some…

    …times it is appropriate.
    michaelklishin committed Oct 12, 2008
  5. @michaelklishin
  6. @michaelklishin
  7. @michaelklishin
  8. @mholub @michaelklishin

    fixed specs for viewmatchers

    Signed-off-by: Michael S. Klishin <michael@novemberain.com>
    mholub committed with michaelklishin Oct 11, 2008
  9. @mholub @michaelklishin

    Add warning when loading rexml instead of libxml-ruby

    Signed-off-by: Michael S. Klishin <michael@novemberain.com>
    mholub committed with michaelklishin Oct 11, 2008
  10. @mholub @michaelklishin

    #329 bug fix

    Signed-off-by: Michael S. Klishin <michael@novemberain.com>
    mholub committed with michaelklishin Oct 11, 2008
  11. @michaelklishin
  12. @michaelklishin

    Since intention/option comment behind workers respawn in -k are not c…

    …lear, do not let killing master with -k for now.
    michaelklishin committed Oct 12, 2008
  13. @michaelklishin
Commits on Oct 11, 2008
  1. @michaelklishin
  2. @michaelklishin

    Merge branch 'sprint'

    * sprint:
      Updated GemManagement
    michaelklishin committed Oct 11, 2008
  3. @fabien

    Updated GemManagement

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

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

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

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

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

    committed Oct 11, 2008
  9. Fixes given again

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

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