Skip to content
This repository
branch: work

Apr 02, 2012

  1. Konstantin Haase

    Merge pull request #498 from sjoonk/master

    Adding the attention line right below the Sinatra headline
    rkh authored
  2. Sukjoon Kim

    adding version mismatch attention message

    sjoonk authored
  3. Konstantin Haase

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

    rkh authored

Mar 23, 2012

  1. Konstantin Haase

    Merge pull request #494 from jaseg/showexceptions_accept_headers

    Showexceptions accept headers
    rkh authored
  2. Modified showexceptions.rb to obey HTTP ACCEPT handlers

    jaseg authored
  3. Konstantin Haase

    Merge pull request #493 from sjoonk/master

    Sinatra README Korean translation
    rkh authored
  4. Sukjoon Kim

    add README.ko.rdoc for Korean translation

    sjoonk authored

Mar 19, 2012

  1. Konstantin Haase

    allow 1.9 modes on jruby and rbx to fail

    rkh authored

Mar 18, 2012

  1. Konstantin Haase

    retry failing integration tests

    rkh authored
  2. Konstantin Haase

    add puma to Gemfile

    rkh authored
  3. Konstantin Haase

    don't set -w with thin in integration tests

    rkh authored
  4. Konstantin Haase

    there is no assert_equal on 1.8

    rkh authored
  5. Konstantin Haase

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

    …ht be a warning)
    rkh authored
  6. Konstantin Haase

    install less 1.0 on 1.8

    rkh authored
  7. Konstantin Haase

    do not use URI.encode on 1.9 (deprecated)

    rkh authored
  8. Konstantin Haase

    refactor #set to not generate warnings

    rkh authored
  9. Konstantin Haase

    add (failing) test to check that there are no warnings

    rkh authored
  10. Konstantin Haase

    don't let integration tests block indefinitely

    rkh authored
  11. Konstantin Haase

    remove empty line

    rkh authored

Mar 15, 2012

  1. Konstantin Haase

    fix gemfile

    rkh authored
  2. Konstantin Haase

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

    rkh authored
  3. Konstantin Haase

    refactor stream helper

    rkh authored
  4. Konstantin Haase

    prevent streaming issue with Rack::Lint and friends, fixes #473

    rkh authored
  5. Konstantin Haase

    Merge pull request #488 from michelc/master

    Added public_dir alias in readme.fr
    rkh authored
  6. Konstantin Haase

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

    rkh authored
  7. Konstantin Haase

    skip liquid on rbx in 1.9 mode for now

    rkh authored
  8. Michel

    Add public_dir alias in readme.fr

    michelc authored
  9. Konstantin Haase

    Merge pull request #486 from mjijackson/clean_build

    More narrow definition of Sinatra::Base#build
    rkh authored
  10. metakeule

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

    Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
    metakeule authored rkh committed
  11. Konstantin Haase

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

    rkh authored
  12. Konstantin Haase

    Merge pull request #480 from ohhgabriel/readme-es

    update requirements section in README.es
    rkh authored
  13. Konstantin Haase

    change deprecation warning

    rkh authored
  14. Konstantin Haase

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

    Conflicts:
    	lib/sinatra/base.rb
    rkh authored
  15. Konstantin Haase

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

    into ohhgabriel-public_dir_alias
    rkh authored
  16. Konstantin Haase

    Merge pull request #487 from trevor/indepedant

    1byte indent fix
    rkh authored
Something went wrong with that request. Please try again.