Permalink
Commits on Aug 20, 2012
  1. Merge pull request #562 from timfel/master

    rkh committed Aug 20, 2012
    Omit wlang and rabl when running on MagLev
Commits on Aug 19, 2012
Commits on Aug 17, 2012
  1. Merge pull request #561 from timfel/fix-settings-test-maglev

    rkh committed Aug 17, 2012
    MagLev doesn't #expand __FILE__ like it should
Commits on Aug 10, 2012
  1. Merge pull request #558 from burningTyger/master

    rkh committed Aug 10, 2012
    README update and typo
Commits on Aug 9, 2012
  1. typo in README

    burningTyger committed Aug 9, 2012
  2. update German README

    burningTyger committed Aug 9, 2012
Commits on Aug 2, 2012
  1. Merge pull request #557 from rogeriozambon/master

    rkh committed Aug 2, 2012
    Some changes and corrections in PT-BR documentation.
Commits on Aug 1, 2012
Commits on Jul 31, 2012
  1. switch back to default jdk

    rkh committed Jul 31, 2012
  2. Merge pull request #555 from michaelklishin/patch-1

    rkh committed Jul 31, 2012
    Disable invokedynamic for now
  3. Disable invokedynamic for now

    Michael Klishin
    Michael Klishin committed Jul 31, 2012
    @rkh knows what this is about. JRuby folks agree this is a good idea for
    now.
  4. Merge pull request #554 from neektza/master

    rkh committed Jul 31, 2012
    Just a tiny spelling fix.
  5. use $PORT if set

    rkh committed Jul 31, 2012
Commits on Jul 30, 2012
  1. Update lib/sinatra/base.rb

    neektza committed Jul 30, 2012
    Spelling.
  2. switch the jdk

    rkh committed Jul 30, 2012
Commits on Jul 20, 2012
  1. Merge pull request #552 from vast/ru-readme-sync

    rkh committed Jul 20, 2012
    README.ru: don't encourage disabling rack-protection
Commits on Jul 18, 2012
  1. Merge pull request #550 from etehtsea/trailing-whitespaces

    rkh committed Jul 18, 2012
    Remove trailing whitespaces
  2. Remove trailing whitespaces

    etehtsea committed Jul 18, 2012
Commits on Jul 12, 2012
  1. Merge pull request #492 from floere/master

    rkh committed Jul 12, 2012
    Correct handling of "/:name.?:format?" and "/:user@?:host?"
  2. remove accidental indentation

    floere committed Jul 12, 2012
Commits on Jul 7, 2012
  1. Merge pull request #549 from Wolg/readme-ru

    rkh committed Jul 7, 2012
    Russian README update
  2. WLang templates in README.ru

    Wolg committed Jul 7, 2012
  3. Typo corrections in README.ru

    Wolg committed Jul 7, 2012
Commits on Jul 6, 2012
  1. Merge pull request #544 from mhutchin/typo-patch

    rkh committed Jul 6, 2012
    Typo corrections and minor copy editing of README.rdoc
  2. Merge pull request #548 from kgrz/issue-504

    rkh committed Jul 6, 2012
    Added a default encoding for RDoc parsing in gemspec file
  3. Merge pull request #547 from matschaffer/doc/after-handler

    rkh committed Jul 6, 2012
    Include information about :after_handler exception setting
  4. added rdoc option in gemspec

    kgrz committed Jul 6, 2012
    which will force utf-8 encoding irrespective of the locale
    settings of the user.
Commits on Jul 2, 2012
  1. Merge pull request #546 from ohhgabriel/readme-es

    rkh committed Jul 2, 2012
    Spanish readme sync
Commits on Jul 1, 2012