Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: michelc/sinatra
...
head fork: michelc/sinatra
Commits on Mar 08, 2012
@rkh rkh ignore double logging issue on webrick for now 41c5529
@rkh rkh add puma de02cb4
@rkh rkh Merge pull request #476 from michelc/master
Update requirements section in readme.fr
8494ca6
@rkh rkh add test for #473 202f6b2
@rkh rkh Merge branch 'master' of github.com:sinatra/sinatra 559376f
@burningTyger burningTyger update for the German Readme d938c95
@rkh rkh Merge pull request #477 from burningTyger/master
README update
2efb82b
Commits on Mar 10, 2012
@rkh rkh JRuby raises an Exception if process is already dead 935d023
@rkh rkh JRuby raises SystemCallError instead of Errno::ECONNRESET 0e1a97a
@rkh rkh don't run thin tests on jruby 09d3918
@nicksieger nicksieger JRuby version of integration server, started in-process w/ ScriptingC…
…ontainer
f1f69f0
Commits on Mar 11, 2012
@rkh rkh Merge pull request #479 from nicksieger/jruby-integration-tests
JRuby version of integration server, started in-process w/ ScriptingContainer
cc1ca2a
@rkh rkh fix subclass streaming test 3023a51
@rkh rkh Merge branch 'master' of github.com:sinatra/sinatra 2cbe42e
@rkh rkh fix "unused variable" warning 2c544ca
@rkh rkh allow 1.9.2 to fail with rack master on travis 0150c0f
@rkh rkh Revert "allow 1.9.2 to fail with rack master on travis"
This reverts commit 0150c0f.
41365d2
@rkh rkh don't install Sass/SCSS on Ruby 2.0 3b620cb
@rkh rkh don't trust git encoding 4e3487c
@gnandretta gnandretta update requirements section in README.es 7c24596
@gnandretta gnandretta alias public_folder as public_dir 3054dbc
@gnandretta gnandretta doc public_dir a8d0f9a
Commits on Mar 13, 2012
@rkh rkh haml still ships with sass 8618ce9
@rkh rkh increase timeout for integration test 51c99f8
@rkh rkh also rescue OpenURI::HTTPError for heartbeat ping in integration test a24813b
Commits on Mar 14, 2012
@trevor trevor include puma server in docs 44d06fd
@rkh rkh Merge pull request #485 from trevor/patch-1
include puma server in docs
a964312
Commits on Mar 15, 2012
@trevor trevor 1byte indent fix e45b7ec
@rkh rkh Merge pull request #487 from trevor/indepedant
1byte indent fix
ac3a7fd
@rkh rkh Merge branch 'public_dir_alias' of https://github.com/ohhgabriel/sinatra
 into ohhgabriel-public_dir_alias
9cfaa26
@rkh rkh Merge branch 'master' of github.com:sinatra/sinatra
Conflicts:
	lib/sinatra/base.rb
5ae2c5f
@rkh rkh Merge pull request #480 from ohhgabriel/readme-es
update requirements section in README.es
930d2c6
@michelc Add public_dir alias in readme.fr 4562b02
Something went wrong with that request. Please try again.