Skip to content
Commits on Apr 2, 2012
  1. @rkh

    Merge pull request #498 from sjoonk/master

    Adding the attention line right below the Sinatra headline
    rkh committed Apr 2, 2012
  2. @sjoonk
  3. @rkh
Commits on Mar 23, 2012
  1. @rkh

    Merge pull request #494 from jaseg/showexceptions_accept_headers

    Showexceptions accept headers
    rkh committed Mar 23, 2012
  2. @jaseg
  3. @rkh

    Merge pull request #493 from sjoonk/master

    Sinatra README Korean translation
    rkh committed Mar 23, 2012
  4. @sjoonk
Commits on Mar 19, 2012
  1. @rkh
Commits on Mar 18, 2012
  1. @rkh

    retry failing integration tests

    rkh committed Mar 18, 2012
  2. @rkh

    add puma to Gemfile

    rkh committed Mar 18, 2012
  3. @rkh
  4. @rkh

    there is no assert_equal on 1.8

    rkh committed Mar 18, 2012
  5. @rkh

    do not make assumptions about first log line in integration test (mig…

    …ht be a warning)
    rkh committed Mar 18, 2012
  6. @rkh

    install less 1.0 on 1.8

    rkh committed Mar 18, 2012
  7. @rkh
  8. @rkh
  9. @rkh
  10. @rkh
  11. @rkh

    remove empty line

    rkh committed Mar 18, 2012
Commits on Mar 15, 2012
  1. @rkh

    fix gemfile

    rkh committed Mar 15, 2012
  2. @rkh
  3. @rkh

    refactor stream helper

    rkh committed Mar 15, 2012
  4. @rkh
  5. @rkh

    Merge pull request #488 from michelc/master

    Added public_dir alias in readme.fr
    rkh committed Mar 15, 2012
  6. @rkh
  7. @rkh
  8. @michelc
  9. @rkh

    Merge pull request #486 from mjijackson/clean_build

    More narrow definition of Sinatra::Base#build
    rkh committed Mar 15, 2012
  10. @metakeule @rkh

    add :server_settings to pass options to :server, merges #431

    Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
    metakeule committed with rkh Mar 15, 2012
  11. @rkh
  12. @rkh

    Merge pull request #480 from ohhgabriel/readme-es

    update requirements section in README.es
    rkh committed Mar 15, 2012
  13. @rkh

    change deprecation warning

    rkh committed Mar 15, 2012
  14. @rkh

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

    Conflicts:
    	lib/sinatra/base.rb
    rkh committed Mar 15, 2012
  15. @rkh

    Merge branch 'public_dir_alias' of https://github.com/ohhgabriel/sinatra

     into ohhgabriel-public_dir_alias
    rkh committed Mar 15, 2012
  16. @rkh

    Merge pull request #487 from trevor/indepedant

    1byte indent fix
    rkh committed Mar 15, 2012
Something went wrong with that request. Please try again.