Permalink
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

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

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

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

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

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

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

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

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

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

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

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

    Russian README update
    rkh committed Jul 7, 2012
  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

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

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

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

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

    Spanish readme sync
    rkh committed Jul 2, 2012
Commits on Jul 1, 2012
Commits on Jun 30, 2012
  1. Typo corrections and minor copy editing of README.rdoc

    Michael Hutchinson committed Jun 30, 2012
Commits on Jun 28, 2012
  1. Merge pull request #539 from mhutchin/patch-1

    Typo corrections in README.rdoc.
    rkh committed Jun 28, 2012
  2. Typo corrections.

    Michael Hutchinson committed Jun 28, 2012
Commits on Jun 25, 2012
  1. Merge pull request #538 from maccman/patch-1

    Fix quotes.
    rkh committed Jun 25, 2012
  2. Fix quotes.

    maccman committed Jun 25, 2012
Commits on Jun 23, 2012
  1. Merge pull request #533 from 12k/master

    Markdown fix
    rkh committed Jun 23, 2012
  2. Merge branch 'rabl' of https://github.com/jc00ke/sinatra into jc00ke-…

    …rabl
    
    Conflicts:
    	Gemfile
    rkh committed Jun 23, 2012
Commits on Jun 20, 2012
  1. Markdown fix

    Melvin Lammerts committed Jun 20, 2012
Commits on Jun 19, 2012