git clone git://github.com/wycats/merb-core.git
Add more advanced nested routes examples to Merb::Router::Behavior#match documentation.
Add a bunch of pretty advanced spec examples for nested matches in routes.
Code clean-up behavior.rb
Created Documentation for new #match functionality
Changes to behavior.rb to allow for :controller, :actions and :params options to be passed in
Implemented Merb::Router::Behavior#match! that is a shortcut for match(...).to({}).
Improve Merb boot diagram.
Make each subsequent call to use_orm just replace effect of previos.
Remove WIP spec for Merb::Router::Behavior#redirect.
fix typo in request_spec.rb
Merge branch 'master' of git@github.com:wycats/merb-core
Needs to raise here since if the generator scope has more than one ORM the geneartors will not work.
Log instead of raising when dependencies mechanism this ORM required twice.
Get rid of Kernel#registered_orm?, it is no longer in use.
Make Kernel#registred_orm? use simple include lookup.
Fix spec and Kernel#registred_orm? conditions bug.
Merge branch 'wycats'
Fix a typo.
Fixed erronous documentation in Merb::Router::Behavior
Working on Behaviour#redirect feature: stashing changes.
update callable_actions to exclude any methods beggining with an _underscope
Adds template-checking code to branch where :with option is specified in partials.
Add two notes on layout method versus :layout option of render method.
Forget to add template for added spec example.
Add spec example for render :layout => false that overrides layout.
More sweet empty lines management in controller fixtures.
Clean up empty lines in fixture controller.
Fix _template_for documentation: content type does not default to nil.
