[DRE-commits] [nanoc] 01/02: Merge tag 'upstream/4.3.2'

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository nanoc.

commit 3167b40c7bb98a832078bd780cffd94469c52a5b
Merge: 196be39 304f0eb
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Aug 23 21:46:24 2016 +0200

    Merge tag 'upstream/4.3.2'
    
    Upstream version 4.3.2
    
    # gpg: keyserver option 'ca-cert-file' is obsolete; please use 'hkp-cacert' in dirmngr.conf
    # gpg: Signature faite le mar. 23 août 2016 21:46:23 CEST
    # gpg:                avec la clef RSA 0x89AF82B739CD217A
    # 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

 CONTRIBUTING.md                                   |  38 -----
 Gemfile.lock                                      |  45 +++---
 NEWS.md                                           |  27 +++-
 lib/nanoc/base/compilation/dependency_tracker.rb  |   5 +
 lib/nanoc/base/compilation/filter.rb              |   7 +
 lib/nanoc/base/contracts_support.rb               |   6 +
 lib/nanoc/base/entities/item_rep.rb               |   1 -
 lib/nanoc/base/plugin_registry.rb                 |  25 ++-
 lib/nanoc/base/repos/data_source.rb               |   4 +-
 lib/nanoc/cli.rb                                  |   5 +
 lib/nanoc/cli/commands/compile.rb                 |   2 +-
 lib/nanoc/cli/commands/deploy.rb                  |   3 +-
 lib/nanoc/extra/deployers/fog.rb                  |   5 +-
 lib/nanoc/extra/filesystem_tools.rb               |   4 +-
 lib/nanoc/helpers/blogging.rb                     | 186 +++-------------------
 lib/nanoc/helpers/breadcrumbs.rb                  |  12 +-
 lib/nanoc/helpers/capturing.rb                    |  65 +-------
 lib/nanoc/helpers/child_parent.rb                 |  31 +---
 lib/nanoc/helpers/filtering.rb                    |  22 +--
 lib/nanoc/helpers/html_escape.rb                  |  23 +--
 lib/nanoc/helpers/link_to.rb                      |  80 +---------
 lib/nanoc/helpers/rendering.rb                    |  87 ++--------
 lib/nanoc/helpers/tagging.rb                      |  46 ++----
 lib/nanoc/helpers/text.rb                         |  24 +--
 lib/nanoc/helpers/xml_sitemap.rb                  |  38 +----
 lib/nanoc/spec.rb                                 |   5 +-
 lib/nanoc/version.rb                              |   2 +-
 tasks/rubocop.rake                                |   2 +-
 tasks/test.rake                                   |   2 +-
 test/base/test_dependency_tracker.rb              |   5 +-
 test/cli/test_cleaning_stream.rb                  |   6 +
 test/cli/test_error_handler.rb                    |   2 +-
 test/extra/checking/checks/test_external_links.rb |   2 +-
 33 files changed, 190 insertions(+), 627 deletions(-)

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