Skip to content
This repository

Fixed a missing backtick literal #646

Closed
wants to merge 86 commits into from
 +11,753 8,617

15 participants

Kashyap Dezső Zoltán Robin Dupret Konstantin Haase burningTyger Pieter van de Bruggen Richo Healey Tony Miller Vasily Polovnyov Postmodern akicho8 Markus Prinz Alexey Muranov Uchio KONDO Nathan Esquenazi
Kashyap

Beware of any conflicts.

and others added some commits January 09, 2013
Kashyap rdoc to md conversion in progress 0b16fc5
Kashyap testing blockquote 8d718ef
Kashyap testing blockquote 64a659c
Kashyap testing blockquote ae91193
Kashyap testing blockquote 3cb91c4
Kashyap testing blockquote eb73fe0
Kashyap First walkthrough done. a43f41f
Kashyap First walkthrough done. 7283064
Kashyap Fixed a typo and finished the conversion. f12333b
Kashyap Fixed some more errors. 2e9dc82
Kashyap Fixed some more errors. 766c80f
Kashyap Trying out code blocks instead of Rdoc tables 8d9442b
Kashyap Testing out some HTML in Markdown 63a18c4
Kashyap Added the html definition lists 40f59da
Kashyap <pre> tags break the whole layout. Testing out <tt> tags e47cfff
Kashyap <pre> tags break the whole layout. Replacing them with <tt> tags 90a3350
Kashyap Fixed a typo 95ab367
Kashyap Merge branch 'master' of git://github.com/sinatra/sinatra f999620
Kashyap Removed the <li> tag for the markdown template list e0cbf22
Dezső Zoltán [FIX] Make route parsing regex more robust
- fixes sinatra/sinatra/#611
- adds support for case-insensitive URL encoding
3cd0331
Dezső Zoltán [FIX] Support ruby 1.8 in routing regex 4d3a396
Robin Dupret Rewrite the french README in Markdown d1ed3d6
Konstantin Haase default response content type to html even with newest rack 303e6c6
Konstantin Haase unloadable library might raise NameError in tilt master 72845db
Konstantin Haase do not call super in Response#finish to avoid infinite loop or body p…
…roxy
c90aa87
Konstantin Haase make sure we support escaped new lines, closes #568 78de1eb
Konstantin Haase disable wlang on rbx in 1.8 mode, too 59deeee
Konstantin Haase rbx-19mode is segfaulting on travis dd52a37
Konstantin Haase rubinius is segfaulting ebe2f45
burningTyger fix broken links in README.md d8af624
burningTyger remove 1.8 -rubygems cli argument from READMEs 1797299
burningTyger convert README.de to markdown 4280c93
burningTyger remove German rdoc README
It was replaced with a markdown version of it in fe258f2
8a80c05
Pieter van de Bruggen Bringing Accept header parsing in line with the spec. 44a968f
Pieter van de Bruggen Ensuring that generated Content-Type headers properly escape params. fc3a7bb
Pieter van de Bruggen Exposing Accept header parameters. b446834
Pieter van de Bruggen Simplifying regular expression to silence warnings. 10542bd
Richo Healey Explicitly set falsy values for :template should not render a template 8c8ab33
Tony Miller code typo in streaming example in README 1be8d3e
Tony Miller chat example: .live is removed in latest jquery, use .submit 389ba36
Vasily Polovnyov convert README.ru.rdoc to README.ru.md 3e7afea
Vasily Polovnyov fix code blocks in README.ru.md 3f50fc5
Postmodern Default host to localhost when in development mode.
* Running Rack apps on 0.0.0.0 in development mode will allow malicious
  users on the local network (ex: Coffee Shop) to abuse or potentially
  exploit the app. Safer to default host to localhost when in development
  mode.
3eb1190
akicho8 Update README.jp.rdoc 53506c5
Vasily Polovnyov typos in README.ru.md 0300824
Robin Dupret Syntax fix for private methods and parameters d5feb45
Markus Prinz README: Clarify what the special `not_found` and `error` handlers do e7def68
Tony Miller chat example: use .on instead of submit ae42c07
Konstantin Haase don't run rdiscount tests on 1.9.2 64a0578
Konstantin Haase lock to rdoc 1.x for now ad2cc0b
Konstantin Haase fix rdoc version daa371b
Konstantin Haase run against 2.0.0 on travis 4bb33a6
Alexey Muranov Move "Embedded Templates" subsection in README
Move "Embedded Templates" subsection in English and Russian README to a more appropriate place.
279d468
Alexey Muranov Fix Russian README
In Russian README, "Вложенные шаблоны" -> "Включённые шаблоны"
51bf9c0
Uchio KONDO Fix CALLERS_TO_IGNORE to ignore Rubygems 2.0.0 require definition file
- Fixes #642
30c9eb2
Alexey Muranov Allow 5 template helpers to take a block 0915f80
Alexey Muranov Tests: 5 template helpers can nest layouts beec8e8
Alexey Muranov Add README section on new way of nesting layouts
Add README section "Templates with `yield` and nested layouts" in English and Russian.
c584cdd
Alexey Muranov "Embedded Templates" -> "Literal Templates"
In English and Russian README, rename "Embedded Templates" to "Literal Templates".
4baaf83
Konstantin Haase update changes, fixes #633 and #639 ab2fc42
Konstantin Haase take views into account for template caching, fixes #631 59d0799
Konstantin Haase no longer override define_singleton_method, fixes #567 fdb9cb0
Konstantin Haase setting status to 404 in error handler should not trigger not_found h…
…andler, fixes #541
279c1f1
Konstantin Haase added test for #500 ec74cee
Konstantin Haase make not_found also trigger on NotFound exception directly, fixes #500 8fd5602
Nathan Esquenazi Adds failing test for content-length and not_found
Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
1afb83c
Konstantin Haase update changes f1aba63
Konstantin Haase resetting body should drop Content-Length, fixes #608 4c80885
Konstantin Haase add layout_options, fixes #495 3fd215a
Konstantin Haase add session option to protection, fixes #601 01118c8
Konstantin Haase add x_cascade option, fixes #621 30e78da
Konstantin Haase remove trailing whitespace from readme a804927
Konstantin Haase add tests to show body is already working properly, fixes #512 0798814
Konstantin Haase use binread for parsing CHANGES c555b99
Konstantin Haase improve code markup in English readme
Conflicts:
	README.md
d748d40
Konstantin Haase changes don't have to be up to date for a prerelease 657c12e
Konstantin Haase turn Modular vs. Classic Style comparison into a proper table 27824f4
Konstantin Haase add support for stylus templates, fixes #553 f9dbb26
Konstantin Haase stylus is not available yet in latest tilt 87b639b
Konstantin Haase Revert "stylus is not available yet in latest tilt"
This reverts commit 80b79c8.
487283f
Konstantin Haase need to require 'stylus/tilt' 6c958bb
Konstantin Haase need to load both stylus and stylus/tilt e25ec6d
Konstantin Haase don't run stylus on rbx 1.9 mode fb7a297
Konstantin Haase add toc c6dc58f
Konstantin Haase fix rake task for ruby 1.8 ac2fa8e
Kashyap Fixed a missing backtick literal b883444
Kashyap kgrz closed this February 26, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 86 unique commits by 15 authors.

Jan 09, 2013
Kashyap rdoc to md conversion in progress 0b16fc5
Kashyap testing blockquote 8d718ef
Kashyap testing blockquote 64a659c
Kashyap testing blockquote ae91193
Kashyap testing blockquote 3cb91c4
Kashyap testing blockquote eb73fe0
Kashyap First walkthrough done. a43f41f
Jan 10, 2013
Kashyap First walkthrough done. 7283064
Kashyap Fixed a typo and finished the conversion. f12333b
Kashyap Fixed some more errors. 2e9dc82
Kashyap Fixed some more errors. 766c80f
Kashyap Trying out code blocks instead of Rdoc tables 8d9442b
Jan 11, 2013
Kashyap Testing out some HTML in Markdown 63a18c4
Kashyap Added the html definition lists 40f59da
Kashyap <pre> tags break the whole layout. Testing out <tt> tags e47cfff
Kashyap <pre> tags break the whole layout. Replacing them with <tt> tags 90a3350
Kashyap Fixed a typo 95ab367
Jan 20, 2013
Kashyap Merge branch 'master' of git://github.com/sinatra/sinatra f999620
Kashyap Removed the <li> tag for the markdown template list e0cbf22
Feb 26, 2013
Dezső Zoltán [FIX] Make route parsing regex more robust
- fixes sinatra/sinatra/#611
- adds support for case-insensitive URL encoding
3cd0331
Dezső Zoltán [FIX] Support ruby 1.8 in routing regex 4d3a396
Robin Dupret Rewrite the french README in Markdown d1ed3d6
Konstantin Haase default response content type to html even with newest rack 303e6c6
Konstantin Haase unloadable library might raise NameError in tilt master 72845db
Konstantin Haase do not call super in Response#finish to avoid infinite loop or body p…
…roxy
c90aa87
Konstantin Haase make sure we support escaped new lines, closes #568 78de1eb
Konstantin Haase disable wlang on rbx in 1.8 mode, too 59deeee
Konstantin Haase rbx-19mode is segfaulting on travis dd52a37
Konstantin Haase rubinius is segfaulting ebe2f45
burningTyger fix broken links in README.md d8af624
burningTyger remove 1.8 -rubygems cli argument from READMEs 1797299
burningTyger convert README.de to markdown 4280c93
burningTyger remove German rdoc README
It was replaced with a markdown version of it in fe258f2
8a80c05
Pieter van de Bruggen Bringing Accept header parsing in line with the spec. 44a968f
Pieter van de Bruggen Ensuring that generated Content-Type headers properly escape params. fc3a7bb
Pieter van de Bruggen Exposing Accept header parameters. b446834
Pieter van de Bruggen Simplifying regular expression to silence warnings. 10542bd
Richo Healey Explicitly set falsy values for :template should not render a template 8c8ab33
Tony Miller code typo in streaming example in README 1be8d3e
Tony Miller chat example: .live is removed in latest jquery, use .submit 389ba36
Vasily Polovnyov convert README.ru.rdoc to README.ru.md 3e7afea
Vasily Polovnyov fix code blocks in README.ru.md 3f50fc5
Postmodern Default host to localhost when in development mode.
* Running Rack apps on 0.0.0.0 in development mode will allow malicious
  users on the local network (ex: Coffee Shop) to abuse or potentially
  exploit the app. Safer to default host to localhost when in development
  mode.
3eb1190
akicho8 Update README.jp.rdoc 53506c5
Vasily Polovnyov typos in README.ru.md 0300824
Robin Dupret Syntax fix for private methods and parameters d5feb45
Markus Prinz README: Clarify what the special `not_found` and `error` handlers do e7def68
Tony Miller chat example: use .on instead of submit ae42c07
Konstantin Haase don't run rdiscount tests on 1.9.2 64a0578
Konstantin Haase lock to rdoc 1.x for now ad2cc0b
Konstantin Haase fix rdoc version daa371b
Konstantin Haase run against 2.0.0 on travis 4bb33a6
Alexey Muranov Move "Embedded Templates" subsection in README
Move "Embedded Templates" subsection in English and Russian README to a more appropriate place.
279d468
Alexey Muranov Fix Russian README
In Russian README, "Вложенные шаблоны" -> "Включённые шаблоны"
51bf9c0
Uchio KONDO Fix CALLERS_TO_IGNORE to ignore Rubygems 2.0.0 require definition file
- Fixes #642
30c9eb2
Alexey Muranov Allow 5 template helpers to take a block 0915f80
Alexey Muranov Tests: 5 template helpers can nest layouts beec8e8
Alexey Muranov Add README section on new way of nesting layouts
Add README section "Templates with `yield` and nested layouts" in English and Russian.
c584cdd
Alexey Muranov "Embedded Templates" -> "Literal Templates"
In English and Russian README, rename "Embedded Templates" to "Literal Templates".
4baaf83
Konstantin Haase update changes, fixes #633 and #639 ab2fc42
Konstantin Haase take views into account for template caching, fixes #631 59d0799
Konstantin Haase no longer override define_singleton_method, fixes #567 fdb9cb0
Konstantin Haase setting status to 404 in error handler should not trigger not_found h…
…andler, fixes #541
279c1f1
Konstantin Haase added test for #500 ec74cee
Konstantin Haase make not_found also trigger on NotFound exception directly, fixes #500 8fd5602
Nathan Esquenazi Adds failing test for content-length and not_found
Signed-off-by: Konstantin Haase <konstantin.mailinglists@googlemail.com>
1afb83c
Konstantin Haase update changes f1aba63
Konstantin Haase resetting body should drop Content-Length, fixes #608 4c80885
Konstantin Haase add layout_options, fixes #495 3fd215a
Konstantin Haase add session option to protection, fixes #601 01118c8
Konstantin Haase add x_cascade option, fixes #621 30e78da
Konstantin Haase remove trailing whitespace from readme a804927
Konstantin Haase add tests to show body is already working properly, fixes #512 0798814
Konstantin Haase use binread for parsing CHANGES c555b99
Konstantin Haase improve code markup in English readme
Conflicts:
	README.md
d748d40
Konstantin Haase changes don't have to be up to date for a prerelease 657c12e
Konstantin Haase turn Modular vs. Classic Style comparison into a proper table 27824f4
Konstantin Haase add support for stylus templates, fixes #553 f9dbb26
Konstantin Haase stylus is not available yet in latest tilt 87b639b
Konstantin Haase Revert "stylus is not available yet in latest tilt"
This reverts commit 80b79c8.
487283f
Konstantin Haase need to require 'stylus/tilt' 6c958bb
Konstantin Haase need to load both stylus and stylus/tilt e25ec6d
Konstantin Haase don't run stylus on rbx 1.9 mode fb7a297
Konstantin Haase add toc c6dc58f
Konstantin Haase fix rake task for ruby 1.8 ac2fa8e
Kashyap Fixed a missing backtick literal b883444
Something went wrong with that request. Please try again.