[DRE-commits] [nanoc] 01/06: Merge tag 'upstream/4.1.4'

[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 95292167804da077d602d2d37b1912985760dec9
Merge: 21ee71a b51e4bb
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Feb 29 13:03:08 2016 +0100

    Merge tag 'upstream/4.1.4'
    
    Upstream version 4.1.4
    
    # gpg: Signature faite le lun. 29 févr. 2016 13:03:07 CET
    # 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

 Gemfile.lock                             | 39 ++++++++++++++------------
 NEWS.md                                  | 19 +++++++++++++
 lib/nanoc/base/compilation/filter.rb     |  2 +-
 lib/nanoc/base/entities/configuration.rb |  4 +++
 lib/nanoc/base/entities/identifier.rb    |  4 +--
 lib/nanoc/cli/commands/compile.rb        |  8 +++---
 lib/nanoc/cli/commands/show-plugins.rb   |  2 +-
 lib/nanoc/extra/checking/checks/stale.rb | 12 ++++++--
 lib/nanoc/extra/checking/runner.rb       |  8 ++++--
 lib/nanoc/filters/sass.rb                | 21 +++++++++++---
 lib/nanoc/helpers/link_to.rb             | 16 +++++++----
 lib/nanoc/version.rb                     |  2 +-
 metadata.yml                             |  6 ++--
 test/helpers/test_link_to.rb             | 47 ++++++++++++++++++--------------
 14 files changed, 126 insertions(+), 64 deletions(-)

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