Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Oct 29, 2008
  1. More deletions

    authored
  2. Notice of new location

    authored
  3. Removes merb-core

    authored
Commits on Oct 13, 2008
  1. @michaelklishin

    Fixed warning about STATUS_CODES due to 2 requires.

    David James authored michaelklishin committed
    Signed-off-by: Michael S. Klishin <michael@novemberain.com>
  2. @michaelklishin

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

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

    Carl Lerche authored
    Merb::Router.extensions is now the official way to add functionality
    to the router.
  2. @michaelklishin
  3. @michaelklishin
  4. @michaelklishin
  5. @michaelklishin
  6. @michaelklishin
  7. @michaelklishin
  8. @mholub @michaelklishin

    fixed specs for viewmatchers

    mholub authored michaelklishin committed
    Signed-off-by: Michael S. Klishin <michael@novemberain.com>
  9. @mholub @michaelklishin

    Add warning when loading rexml instead of libxml-ruby

    mholub authored michaelklishin committed
    Signed-off-by: Michael S. Klishin <michael@novemberain.com>
  10. @mholub @michaelklishin

    #329 bug fix

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

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

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

    Merge branch 'sprint'

    michaelklishin authored
    * sprint:
      Updated GemManagement
  3. @fabien

    Updated GemManagement

    fabien authored
  4. Merge branch 'sprint'

    authored
  5. @adelcambre
  6. @adelcambre

    crap, stray non-comment

    adelcambre authored
  7. @adelcambre

    Revert "Move most merb logger code out, into extlib"

    adelcambre authored
    This reverts commit 7a73c14.
  8. Merge branch 'sprint'

    authored
  9. Fixes given again

    authored
  10. @adelcambre

    Merge commit 'mtodd/master'

    adelcambre authored
    Conflicts:
    	lib/merb-core/dispatch/router.rb
    	lib/merb-core/dispatch/router/behavior.rb
    	lib/merb-core/rack/helpers.rb
  11. @mtodd
  12. @mtodd
  13. @mtodd
  14. @adelcambre
Something went wrong with that request. Please try again.