Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Mar 12, 2013
  1. @patriciomacadden
Commits on Mar 10, 2013
  1. @rkh

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

    rkh authored
    Conflicts:
    	Gemfile
Commits on Mar 9, 2013
  1. @patriciomacadden
  2. @patriciomacadden
  3. @patriciomacadden
  4. @patriciomacadden
Commits on Mar 8, 2013
  1. @patriciomacadden

    fix gemfile source.

    patriciomacadden authored
Commits on Mar 7, 2013
  1. @rkh

    use rdoc 3.x on 1.8

    rkh authored
  2. @rkh

    Revert "test pass with rdoc 4 now"

    rkh authored
    This reverts commit 9f1cdab.
  3. @rkh

    test pass with rdoc 4 now

    rkh authored
Commits on Mar 3, 2013
  1. @rkh
Commits on Feb 26, 2013
  1. @rkh

    don't run stylus on rbx 1.9 mode

    rkh authored
  2. @rkh
Commits on Feb 25, 2013
  1. @rkh

    fix rdoc version

    rkh authored
  2. @rkh

    lock to rdoc 1.x for now

    rkh authored
  3. @rkh

    don't run rdiscount tests on 1.9.2

    rkh authored
Commits on Jan 26, 2013
  1. @rkh
Commits on Dec 12, 2012
  1. @rkh

    don't run wlang on rbx in 1.9 mode

    rkh authored
Commits on Aug 19, 2012
  1. @timfel
Commits on Jun 23, 2012
  1. @rkh

    Merge branch 'rabl' of https://github.com/jc00ke/sinatra into jc00ke-…

    rkh authored
    …rabl
    
    Conflicts:
    	Gemfile
Commits on Jun 12, 2012
  1. @blambeau
Commits on Jun 6, 2012
  1. @jc00ke

    Don't install RABL on JRuby

    jc00ke authored
    JRuby is throwing a LocalJumpError in a RABL test, so disable for now.
    Issue has been filed jruby/jruby#200
Commits on Jun 1, 2012
  1. @jc00ke

    Adding RABL support

    jc00ke authored
Commits on May 13, 2012
  1. @rkh
  2. @rkh

    add mizuno

    rkh authored
  3. @rkh

    be smarter about servers

    rkh authored
Commits on Mar 18, 2012
  1. @rkh

    add puma to Gemfile

    rkh authored
  2. @rkh

    install less 1.0 on 1.8

    rkh authored
Commits on Mar 15, 2012
  1. @rkh

    fix gemfile

    rkh authored
  2. @rkh
Commits on Mar 11, 2012
  1. @rkh
Commits on Mar 10, 2012
  1. @rkh

    don't run thin tests on jruby

    rkh authored
Commits on Mar 8, 2012
  1. @rkh

    skip yajl on jruby

    rkh authored
Commits on Mar 7, 2012
  1. @rkh
  2. @rkh
Something went wrong with that request. Please try again.