Permalink
Browse files

Merge branch 'master' into prerelease

Conflicts:
	CHANGES
  • Loading branch information...
2 parents 1c46c51 + cf628dd commit 5e6d16ab1213df02c90c5486c51831401af4e5ec @rkh rkh committed Mar 9, 2013
Showing with 10,480 additions and 8,449 deletions.
  1. +11 −1 CHANGES
  2. +2 −4 Gemfile
  3. +1 −0 README.de.md
  4. +2,777 −0 README.es.md
  5. +0 −2,112 README.es.rdoc
  6. +169 −83 README.hu.rdoc → README.hu.md
  7. +1,097 −0 README.jp.md
  8. +0 −1,056 README.jp.rdoc
  9. +2,483 −0 README.ko.md
  10. +0 −1,932 README.ko.rdoc
  11. +8 −0 README.md
  12. +954 −0 README.pt-br.md
  13. +0 −778 README.pt-br.rdoc
  14. +791 −0 README.pt-pt.md
  15. +0 −647 README.pt-pt.rdoc
  16. +2,136 −0 README.zh.md
  17. +0 −1,816 README.zh.rdoc
  18. +2 −2 Rakefile
  19. +3 −3 examples/chat.rb
  20. +17 −7 lib/sinatra/base.rb
  21. +3 −3 sinatra.gemspec
  22. +1 −1 test/delegator_test.rb
  23. +8 −0 test/helper.rb
  24. +4 −1 test/helpers_test.rb
  25. +2 −2 test/rdoc_test.rb
  26. +10 −0 test/readme_test.rb
  27. +1 −1 test/routing_test.rb
View
12 CHANGES
@@ -1,5 +1,7 @@
= 1.4.0 / Not Yet Released
+ * Add support for LINK and UNLINK requests. (Konstantin Haase)
+
* Add support for Yajl templates. (Jamie Hodge)
* Add support for Rabl templates. (Jesse Cooke)
@@ -87,7 +89,7 @@
Alexey Muranov, Konstantin Haase)
* Convert documentation to Markdown. (Kashyap, Robin Dupret, burningTyger,
- Vasily Polovnyov, Iain Barnett)
+ Vasily Polovnyov, Iain Barnett, Giuseppe Capizzi, Neil West)
* Don't set not_found content type to HTML in development mode with custom
not_found handler. (Konstantin Haase)
@@ -102,6 +104,14 @@
* Take views option into account for template caching. (Konstantin Haase)
+ * Consistent use of `headers` instead of `header` internally. (Patricio Mac Adden)
+
+ * Fix compatibility to RDoc 4. (Bohuslav Kabrda)
+
+ * Make chat example work with latest jQuery. (loveky, Tony Miller)
+
+ * Make tests run without warnings. (Patricio Mac Adden)
+
= 1.3.5 / 2013-02-25
* Fix for RubyGems 2.0 (Uchio KONDO)
View
@@ -7,7 +7,7 @@
# If you have issues with a gem: `bundle install --without-coffee-script`.
RUBY_ENGINE = 'ruby' unless defined? RUBY_ENGINE
-source :rubygems unless ENV['QUICK']
+source 'https://rubygems.org' unless ENV['QUICK']
gemspec
gem 'rake'
@@ -35,7 +35,7 @@ gem 'erubis'
gem 'slim', '~> 1.0'
gem 'temple', '!= 0.3.3'
gem 'coffee-script', '>= 2.0'
-gem 'rdoc', '~> 3.12'
+gem 'rdoc', RUBY_VERSION < '1.9' ? '~> 3.12' : '>= 4.0'
gem 'kramdown'
gem 'maruku'
gem 'creole'
@@ -61,8 +61,6 @@ end
if RUBY_ENGINE == "ruby" and RUBY_VERSION > '1.9'
gem 'less', '~> 2.0'
-else
- gem 'less', '~> 1.0'
end
if RUBY_ENGINE != 'jruby' or not ENV['TRAVIS']
View
@@ -106,6 +106,7 @@ Routen mit regulären Ausdrücken sind auch möglich:
get %r{/hallo/([\w]+)} do
"Hallo, #{params[:captures].first}!"
end
+```
Und auch hier können Block-Parameter genutzt werden:
Oops, something went wrong.

0 comments on commit 5e6d16a

Please sign in to comment.