[DRE-commits] [gitlab-shell] 01/02: Merge tag 'upstream/3.6.3'

[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 181553c14cdea287bfa45bd07db531c784c31cd7
Merge: a139096 18d0704
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sat Oct 1 15:13:52 2016 +0530

    Merge tag 'upstream/3.6.3'
    
    Upstream version 3.6.3
    
    # gpg: Signature made Saturday 01 October 2016 03:13:51 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]

 CHANGELOG                                          |  12 ++
 VERSION                                            |   2 +-
 config.yml.example                                 |   7 +
 lib/gitlab_config.rb                               |   4 +
 lib/gitlab_lfs_authentication.rb                   |  32 +++++
 lib/gitlab_net.rb                                  |  34 ++++-
 lib/gitlab_projects.rb                             |  12 +-
 lib/gitlab_shell.rb                                |  95 ++++++++++--
 spec/gitlab_lfs_authentication_spec.rb             |  37 +++++
 spec/gitlab_net_spec.rb                            |  32 +++++
 spec/gitlab_projects_spec.rb                       |   3 +
 spec/gitlab_shell_spec.rb                          | 160 ++++++++++++++++++++-
 spec/vcr_cassettes/lfs-authenticate-ok.yml         |  46 ++++++
 .../two-factor-recovery-codes-fail.yml             |  42 ++++++
 spec/vcr_cassettes/two-factor-recovery-codes.yml   |  42 ++++++
 15 files changed, 541 insertions(+), 19 deletions(-)

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