[DRE-commits] [ruby-github-markup] 02/06: Merge tag 'upstream/1.5.0'

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-github-markup.

commit a1ec13d9c45365ee86276acd459a8fec6d937dfd
Merge: a64eb9f 0d04b94
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Oct 31 10:29:32 2016 +0530

    Merge tag 'upstream/1.5.0'
    
    Upstream version 1.5.0
    
    # gpg: Signature made Monday 31 October 2016 10:29:31 AM IST using RSA key ID CE1F9C674512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>" [ultimate]
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>" [ultimate]
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>" [ultimate]
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>" [ultimate]
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>" [ultimate]

 .gitlab-ci.yml                                 | 27 +++++++
 .travis.yml                                    | 14 +++-
 CONTRIBUTING.md                                | 12 ++--
 Gemfile                                        |  4 +-
 HISTORY.md                                     |  7 ++
 README.md                                      |  2 +
 github-markup.gemspec => gitlab-markup.gemspec |  5 +-
 lib/github-markup.rb                           |  2 +-
 lib/github/commands/rest2html                  | 98 +++++++++++++++++---------
 lib/github/markups.rb                          |  4 +-
 test/markups/README.pod                        |  9 ++-
 test/markups/README.pod.html                   | 46 ++++++------
 test/markups/README.rst                        | 18 +++++
 test/markups/README.rst.html                   | 12 ++++
 14 files changed, 184 insertions(+), 76 deletions(-)

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