[DRE-commits] [nanoc] 01/02: Merge tag 'upstream/4.7.9' into experimental

[Cédric Boutillier]

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

boutil pushed a commit to branch experimental
in repository nanoc.

commit 603f06f9ef8d314f35749bf605f94981286c6ecd
Merge: b7edbe0 be8bae9
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu May 4 11:00:33 2017 +0200

    Merge tag 'upstream/4.7.9' into experimental
    
    Upstream version 4.7.9
    
    # gpg: Signature faite le jeu. 04 mai 2017 11:00:29 CEST
    # gpg:                avec la clef RSA 9CCD6B319DBF8E40AB1ABD1A89AF82B739CD217A
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> » [ultime]
    # Empreinte de clef principale : 3041 4D81 DC28 290C 2568  6DE3 DA49 58F6 11E1 49E9
    #    Empreinte de la sous-clef : 9CCD 6B31 9DBF 8E40 AB1A  BD1A 89AF 82B7 39CD 217A

 Gemfile                                            |  2 +-
 Gemfile.lock                                       | 22 +++++----
 NEWS.md                                            | 12 +++++
 README.md                                          |  2 +-
 lib/nanoc/base/entities/item.rb                    |  5 --
 lib/nanoc/base/repos/site_loader.rb                | 22 ++++++++-
 .../outdatedness_rules/attributes_modified.rb      |  8 ++--
 lib/nanoc/data_sources/filesystem.rb               | 32 ++++++-------
 lib/nanoc/helpers/blogging.rb                      |  5 +-
 lib/nanoc/version.rb                               |  2 +-
 nanoc.gemspec                                      |  2 +-
 spec/nanoc/base/repos/site_loader_spec.rb          | 48 +++++++++++++++++++
 spec/nanoc/regressions/gh_1171_spec.rb             | 55 ++++++++++++++++++++++
 test/data_sources/test_filesystem.rb               | 12 -----
 test/helpers/test_blogging.rb                      | 21 +++++++++
 15 files changed, 196 insertions(+), 54 deletions(-)

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