[DRE-commits] [ruby-sinatra-contrib] 02/08: Merge tag 'upstream/1.4.6'

[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-contrib.

commit 8e803194eb80a9b0ac5d3b4779eaa6aa063344e4
Merge: 6c87fa0 1d72f35
Author: Lunar <lunar at kittens>
Date:   Wed Sep 9 15:34:25 2015 +0200

    Merge tag 'upstream/1.4.6'
    
    Upstream version 1.4.6

 LICENSE                        |   2 +
 README.md                      |   3 +
 Rakefile                       |   6 +-
 checksums.yaml.gz              | Bin 266 -> 0 bytes
 lib/sinatra/capture.rb         |   2 +-
 lib/sinatra/config_file.rb     |   7 +-
 lib/sinatra/contrib/version.rb |   2 +-
 lib/sinatra/cookies.rb         |   6 +-
 lib/sinatra/custom_logger.rb   |  60 +++++++++
 lib/sinatra/decompile.rb       |   8 +-
 lib/sinatra/namespace.rb       |  13 +-
 lib/sinatra/reloader.rb        |  10 +-
 lib/sinatra/respond_with.rb    |  43 +++++--
 lib/sinatra/streaming.rb       |   2 +-
 metadata.yml                   | 274 ++++++++++++++++++++++++++++++++++++-----
 sinatra-contrib.gemspec        |  45 ++++++-
 spec/capture_spec.rb           |  11 +-
 spec/config_file_spec.rb       |   3 +-
 spec/content_for_spec.rb       |   3 +-
 spec/cookies_spec.rb           |  43 ++++---
 spec/custom_logger_spec.rb     |  43 +++++++
 spec/decompile_spec.rb         |   3 +-
 spec/extension_spec.rb         |   5 +-
 spec/json_spec.rb              |   5 +-
 spec/link_header_spec.rb       |   3 +-
 spec/multi_route_spec.rb       |   3 +-
 spec/namespace_spec.rb         | 185 +++++++++++++++++++---------
 spec/reloader_spec.rb          |   3 +-
 spec/respond_with/bar.erb      |   2 +-
 spec/respond_with_spec.rb      |   7 +-
 spec/spec_helper.rb            |   2 +-
 spec/streaming_spec.rb         |   6 +-
 32 files changed, 636 insertions(+), 174 deletions(-)

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