[DRE-commits] [gitlab-shell] 01/03: Merge tag 'upstream/3.6.6'

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository gitlab-shell.

commit f95e3d533c5784260a8ad553ea63a22a59aafb06
Merge: a9bf613 0968a4e
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Oct 31 15:17:46 2016 +0530

    Merge tag 'upstream/3.6.6'
    
    Upstream version 3.6.6
    
    # gpg: Signature made Monday 31 October 2016 03:17:46 PM 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                  | 14 ++++-----
 CHANGELOG                       | 14 +++++++++
 VERSION                         |  2 +-
 bin/create-hooks                |  5 ++-
 hooks/post-receive              |  2 +-
 hooks/pre-receive               |  2 +-
 hooks/update                    |  5 +--
 lib/gitlab_config.rb            |  4 +++
 lib/gitlab_custom_hook.rb       | 12 ++++++--
 lib/gitlab_keys.rb              | 31 ++++++++++++-------
 lib/gitlab_metrics.rb           | 56 ++++++++++++++++++++++++++++++++++
 lib/gitlab_projects.rb          | 67 ++++++++++++++++++++++++++---------------
 lib/gitlab_shell.rb             | 13 +++++---
 spec/gitlab_custom_hook_spec.rb | 33 ++++++++++++++++++++
 spec/gitlab_keys_spec.rb        |  4 +--
 spec/gitlab_metrics_spec.rb     | 26 ++++++++++++++++
 spec/gitlab_projects_spec.rb    | 35 +++++++++++++++++++++
 spec/support/gl_id_test_hook    |  2 ++
 18 files changed, 269 insertions(+), 58 deletions(-)

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