/sinatra

Permalink
Switch branches/tags
Nothing to show
Commits on Aug 20, 2012

  1. Merge pull request #562 from timfel/master

    @rkh
    rkh committed Aug 20, 2012 
    Omit wlang and rabl when running on MagLev
    f383fac
Commits on Aug 19, 2012

  1. omit wlang and rabl when running on MagLev

    @timfel
    timfel committed Aug 19, 2012
    89ed0fd
Commits on Aug 17, 2012

  1. Merge pull request #561 from timfel/fix-settings-test-maglev

    @rkh
    rkh committed Aug 17, 2012 
    MagLev doesn't #expand __FILE__ like it should
    08be86a

  2. MagLev doesn't #expand __FILE__ like it should

    @timfel
    timfel committed Aug 17, 2012
    37e7d43
Commits on Aug 10, 2012

  1. Merge pull request #558 from burningTyger/master

    @rkh
    rkh committed Aug 10, 2012 
    README update and typo
    d1e72d3
Commits on Aug 9, 2012

  1. typo in README

    @burningTyger
    burningTyger committed Aug 9, 2012
    8a216bc

  2. update German README

    @burningTyger
    burningTyger committed Aug 9, 2012
    1746084
Commits on Aug 2, 2012

  1. Merge pull request #557 from rogeriozambon/master

    @rkh
    rkh committed Aug 2, 2012 
    Some changes and corrections in PT-BR documentation.
    f3007c0
Commits on Aug 1, 2012

  1. Some changes and corrections in PT-BR documentation

    @rogeriozambon
    rogeriozambon committed Aug 1, 2012
    199dbe0
Commits on Jul 31, 2012

  1. switch back to default jdk

    @rkh
    rkh committed Jul 31, 2012
    6fed1d7

  2. Merge pull request #555 from michaelklishin/patch-1

    @rkh
    rkh committed Jul 31, 2012 
    Disable invokedynamic for now
    84110e2

  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.
    01bbd46

  4. Merge pull request #554 from neektza/master

    @rkh
    rkh committed Jul 31, 2012 
    Just a tiny spelling fix.
    7e8920f

  5. use $PORT if set

    @rkh
    rkh committed Jul 31, 2012
    d3de670
Commits on Jul 30, 2012

  1. Update lib/sinatra/base.rb

    @neektza
    neektza committed Jul 30, 2012 
    Spelling.
    cb6c4c6

  2. Merge branch 'master' of github.com:sinatra/sinatra

    @rkh
    rkh committed Jul 30, 2012
    4d40a5e

  3. switch the jdk

    @rkh
    rkh committed Jul 30, 2012
    3128206
Commits on Jul 20, 2012

  1. Merge pull request #552 from vast/ru-readme-sync

    @rkh
    rkh committed Jul 20, 2012 
    README.ru: don't encourage disabling rack-protection
    91bce0b

  2. README.ru: don't encourage disabling rack-protection

    @vast
    vast committed Jul 20, 2012
    901bb4e
Commits on Jul 18, 2012

  1. Merge pull request #550 from etehtsea/trailing-whitespaces

    @rkh
    rkh committed Jul 18, 2012 
    Remove trailing whitespaces
    69c0d0a

  2. Remove trailing whitespaces

    @etehtsea
    etehtsea committed Jul 18, 2012
    498bad9
Commits on Jul 12, 2012

  1. Merge pull request #492 from floere/master

    @rkh
    rkh committed Jul 12, 2012 
    Correct handling of "/:name.?:format?" and "/:user@?:host?"
    762967f

  2. remove accidental indentation

    @floere
    floere committed Jul 12, 2012
    e59b62e
Commits on Jul 7, 2012

  1. Merge pull request #549 from Wolg/readme-ru

    @rkh
    rkh committed Jul 7, 2012 
    Russian README update
    e47f6be

  2. WLang templates in README.ru

    @Wolg
    Wolg committed Jul 7, 2012
    be87ed2

  3. Include information about :after_handler exception setting in README.ru

    @Wolg
    Wolg committed Jul 7, 2012
    29696bf

  4. Typo corrections in README.ru

    @Wolg
    Wolg committed Jul 7, 2012
    3a4c38d
Commits on Jul 6, 2012

  1. Merge pull request #544 from mhutchin/typo-patch

    @rkh
    rkh committed Jul 6, 2012 
    Typo corrections and minor copy editing of README.rdoc
    ca4e121

  2. Merge pull request #548 from kgrz/issue-504

    @rkh
    rkh committed Jul 6, 2012 
    Added a default encoding for RDoc parsing in gemspec file
    88d61a2

  3. Merge pull request #547 from matschaffer/doc/after-handler

    @rkh
    rkh committed Jul 6, 2012 
    Include information about :after_handler exception setting
    048af1d

  4. added rdoc option in gemspec

    @kgrz
    kgrz committed Jul 6, 2012 
    which will force utf-8 encoding irrespective of the locale
settings of the user.
    6a023ab

  5. Include information about :after_handler exception setting

    @matschaffer
    matschaffer committed Jul 6, 2012
    f7d2b43
Commits on Jul 2, 2012

  1. Merge pull request #546 from ohhgabriel/readme-es

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

  1. doc WLang templates in README.es

    @gnandretta
    gnandretta committed Jul 1, 2012
    e887811

  2. do not encourage disabling protection in README.es

    @gnandretta
    gnandretta committed Jul 1, 2012
    bd84f2c