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

[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 4e1d62b4a14b7fedb4453b8153eae1c057481efb
Merge: d985fa5 fed72ec
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Thu Aug 8 14:30:15 2013 +0200

    Merge tag 'upstream/1.4.0'
    
    Upstream version 1.4.0

 README.md                          |   17 +-
 lib/sinatra/capture.rb             |   92 +++++-
 lib/sinatra/config_file.rb         |   22 +-
 lib/sinatra/content_for.rb         |    4 +-
 lib/sinatra/contrib/setup.rb       |    4 +-
 lib/sinatra/cookies.rb             |    8 +-
 lib/sinatra/decompile.rb           |   18 +-
 lib/sinatra/extension.rb           |   10 +-
 lib/sinatra/json.rb                |   56 ++--
 lib/sinatra/link_header.rb         |    4 +-
 lib/sinatra/multi_route.rb         |    6 +
 lib/sinatra/namespace.rb           |   15 +-
 lib/sinatra/reloader.rb            |   14 +-
 lib/sinatra/respond_with.rb        |   32 +-
 lib/sinatra/streaming.rb           |   12 +-
 lib/sinatra/test_helpers.rb        |    2 +-
 metadata.yml                       |   33 +--
 sinatra-contrib.gemspec            |   27 +-
 spec/capture_spec.rb               |   15 +-
 spec/config_file/key_value.yml.erb |    6 +
 spec/config_file_spec.rb           |   10 +
 spec/content_for/footer.erb        |    3 -
 spec/content_for/footer.erubis     |    3 -
 spec/content_for/footer.haml       |    2 -
 spec/content_for/footer.slim       |    2 -
 spec/content_for_spec.rb           |    6 +-
 spec/cookies_spec.rb               |   32 +-
 spec/json_spec.rb                  |    8 +-
 spec/multi_route_spec.rb           |   41 ++-
 spec/namespace_spec.rb             |  577 ++++++++++++++++++------------------
 spec/respond_with_spec.rb          |   10 +
 spec/spec_helper.rb                |    1 +
 32 files changed, 626 insertions(+), 466 deletions(-)

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