Update CHANGES.
typo
bump version

(this is not a release)
Add layout_engine option to #render.

This will render an erb file with a haml layout:

    get('/') { erb :index, :layout_engine => :haml }

Whereas this will cause all markdown templates to be rendered with an erb
layout (unless, of course, `:layout_engine` is set explicitly):

    set :markdown, :layout_engine => :erb

Fixes #110.
Merge branch 'filter-conditions'
send_file now takes :last_modified option

fixes #131
Routes can use unicode characters without causing an encoding exception on
Ruby 1.9.

Fixes #81.
Added support for OPTIONS request type.

Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
Updated README.rdoc to reflect added OPTIONS request type.

Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
remove some semicolons
remove whitespaces
add test for locals passed to haml
Updated README.ru.rdoc to reflect latest changes

* filter conditions;
* inline markaby;
* OPTIONS request type.
Updated README.ru.rdoc to reflect latest changes

* filter conditions;
* inline markaby;
* OPTIONS request type.

Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
update REAMDE.es.rdoc

Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
Tilt::CompileSite is deprecated, no longer use it.

Warning: This means current master will render slower with Tilt 1.1. Please use Tilt master or wait for the next Tilt release.
We will not release Sinatra 1.2.0 before Tilt 1.2 is released and this patch will not be part of Sinatra 1.1.1.

This patch does not change Sinatra's behavior in any way.
fix tests for rdoc 3.0
Switch from Hanna to YARD.

* hanna has broken dependencies all the time
* we have a .yardopts file already for rubydoc.info
* just compare the rake tasks
* README has a TOC

This would also allow using YARD's doc tagging system at some point in the
future. Rakefile is still usable even if YARD is not installed.
depend on Tilt 1.2
adjust tests for new version of coffescript