[DRE-commits] [ruby-sinatra] 01/05: Merge tag 'upstream/1.4.5'

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch master
in repository ruby-sinatra.

commit 47986a59e2a8d585b66e39d7ddc5e471895e5101
Merge: 2ba33a3 d1be17c
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Thu Apr 10 22:08:53 2014 +0200

    Merge tag 'upstream/1.4.5'
    
    Upstream version 1.4.5

 .yardopts                                          |    5 +-
 CHANGES                                            |   56 +-
 Gemfile                                            |   80 +-
 LICENSE                                            |    3 +-
 README.de.md                                       |   55 +-
 README.es.md                                       |   69 +-
 README.fr.md                                       | 1068 +++++---
 README.hu.md                                       |   28 +-
 README.ja.md                                       | 2726 ++++++++++++++++++++
 README.jp.md                                       | 1097 --------
 README.ko.md                                       | 1957 ++++++++------
 README.md                                          |  196 +-
 README.pt-br.md                                    |   25 +-
 README.ru.md                                       |   79 +-
 README.zh.md                                       |  129 +-
 Rakefile                                           |    4 +-
 checksums.yaml.gz                                  |  Bin 268 -> 270 bytes
 lib/sinatra/base.rb                                |  173 +-
 lib/sinatra/images/404.png                         |  Bin 23305 -> 18893 bytes
 lib/sinatra/images/500.png                         |  Bin 31056 -> 24378 bytes
 .../{showexceptions.rb => show_exceptions.rb}      |    0
 lib/sinatra/version.rb                             |    2 +-
 metadata.yml                                       |   53 +-
 sinatra.gemspec                                    |    1 +
 test/asciidoctor_test.rb                           |   72 +
 test/base_test.rb                                  |    1 -
 test/compile_test.rb                               |   56 +-
 test/filter_test.rb                                |    2 +-
 test/helpers_test.rb                               |   17 +-
 test/integration/app.rb                            |   17 +
 test/integration_helper.rb                         |   11 +-
 test/integration_test.rb                           |   12 +-
 test/mediawiki_test.rb                             |   68 +
 test/rdoc_test.rb                                  |    4 +-
 test/request_test.rb                               |   24 +
 test/response_test.rb                              |    2 +-
 test/routing_test.rb                               |   23 +-
 test/sass_test.rb                                  |    1 -
 test/scss_test.rb                                  |    1 -
 test/slim_test.rb                                  |    8 +-
 test/static_test.rb                                |   25 +-
 test/templates_test.rb                             |   15 +
 test/views/hello.asciidoc                          |    1 +
 test/views/hello.mediawiki                         |    1 +
 44 files changed, 5512 insertions(+), 2655 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-sinatra.git