[DRE-commits] [ruby-rspec-core] 01/03: Merge tag 'upstream/2.14.7'

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-rspec-core.

commit b6ad1af6e3167cb42e457ee9f5316e12f70f5933
Merge: 979218f 02b5604
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sat Jan 11 06:11:52 2014 +0100

    Merge tag 'upstream/2.14.7'
    
    Upstream version 2.14.7
    
    # gpg: Signature faite le sam. 11 janv. 2014 06:11:51 CET avec la clef RSA d'identifiant 8F9F8F09
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> »

 Changelog.md                                      |  23 +++++
 checksums.yaml.gz                                 | Bin 0 -> 422 bytes
 lib/rspec/core/example.rb                         |   6 --
 lib/rspec/core/formatters/base_text_formatter.rb  |   2 +-
 lib/rspec/core/formatters/helpers.rb              |   2 +-
 lib/rspec/core/formatters/html_formatter.rb       |   4 +-
 lib/rspec/core/pending.rb                         |  14 ++-
 lib/rspec/core/version.rb                         |   2 +-
 metadata.yml                                      | 106 +++++++++-------------
 spec/rspec/core/example_spec.rb                   |  54 ++++++++---
 spec/rspec/core/formatters/helpers_spec.rb        |  10 ++
 spec/rspec/core/formatters/html_formatter_spec.rb |  51 +++++++----
 spec/support/in_sub_process.rb                    |  37 ++++++++
 spec/support/mathn_integration_support.rb         |  12 +++
 14 files changed, 211 insertions(+), 112 deletions(-)

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