Permalink
Commits on Jun 9, 2011
  1. 1.3.0.e release

    rkh committed Jun 9, 2011
  2. Merge branch 'master' into prerelease

    Conflicts:
    	lib/sinatra/base.rb
    	sinatra.gemspec
    rkh committed Jun 9, 2011
  3. Merge pull request #289 from timfel/maglev

    rake test:core task
    rkh committed Jun 9, 2011
  4. fix markup

    rkh committed Jun 9, 2011
  5. Merge pull request #286 from kenichiscg/static_cache_control

    adds check for :static_cache_control setting to Sinatra::Base.static!
    rkh committed Jun 9, 2011
Commits on Jun 8, 2011
  1. update README for new :static_cache_control setting

    kenichi nakamura committed Jun 8, 2011
  2. Merge branch 'master' into static_cache_control

    kenichi nakamura committed Jun 8, 2011
  3. Merge pull request #287 from burningTyger/readme_de

    Readme de update
    rkh committed Jun 8, 2011
Commits on Jun 7, 2011
  1. update README.de.rdoc

    burningTyger committed Jun 7, 2011
Commits on Jun 6, 2011
Commits on Jun 5, 2011
  1. Revert "enable bluecloth"

    This reverts commit 52dc532.
    rkh committed Jun 5, 2011
  2. enable bluecloth

    rkh committed Jun 5, 2011
  3. use Sinatra::VERSION

    rkh committed Jun 5, 2011
  4. clean up gitignore

    rkh committed Jun 5, 2011
  5. correct website link in gemspec

    rkh committed Jun 5, 2011
  6. clean up gemspec

    rkh committed Jun 5, 2011
  7. remove junk from readme

    rkh committed Jun 5, 2011
  8. improve rake authors

    rkh committed Jun 5, 2011
  9. update changes

    rkh committed Jun 5, 2011
  10. do not downcase the server name

    rkh committed Jun 5, 2011
  11. call encode! directly after force_encoding to play

    nice with the internal encoding
    rkh committed Jun 5, 2011
  12. whitespace

    rkh committed Jun 5, 2011
  13. also set charset for json

    rkh committed Jun 5, 2011
  14. refactor #set

    rkh committed Jun 5, 2011
  15. Merge pull request #285 from gaku/master

    Minor JP translation fix
    rkh committed Jun 5, 2011
Commits on Jun 4, 2011
  1. use unbound methods for conditions

    rkh committed Jun 4, 2011
  2. if an error handler is registered for some exception class, let it al…

    …so handle subclasses
    rkh committed Jun 4, 2011
  3. reduce argument swapping

    rkh committed Jun 4, 2011
  4. remove one more instance_eval

    rkh committed Jun 4, 2011