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

[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 80fc7c63ec2cfb9fcedac58a34f7055085f67d56
Merge: fd02b43 5bc9397
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Aug 25 21:39:27 2016 +0530

    Merge tag 'upstream/3.4.0'
    
    Upstream version 3.4.0
    
    # gpg: Signature made Thursday 25 August 2016 09:39:27 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]

 .hound.yml                                  |   3 -
 CHANGELOG                                   |  29 +++++
 VERSION                                     |   2 +-
 bin/authorized_keys                         |   2 +-
 bin/check                                   |  29 ++---
 bin/create-hooks                            |  14 ++-
 bin/gitlab-shell                            |   2 +-
 bin/install                                 |  10 +-
 config.yml.example                          |  16 +--
 hooks/post-receive                          |   7 +-
 hooks/pre-receive                           |  18 ++--
 lib/gitlab_access.rb                        |   9 +-
 lib/gitlab_access_status.rb                 |  12 +--
 lib/gitlab_config.rb                        |   5 -
 lib/gitlab_custom_hook.rb                   |  45 +++-----
 lib/gitlab_keys.rb                          |  58 ++++++----
 lib/gitlab_net.rb                           |  20 +++-
 lib/gitlab_post_receive.rb                  |  46 ++++++--
 lib/gitlab_projects.rb                      |  63 ++++++++++-
 lib/gitlab_redis.rb                         |   2 +
 lib/gitlab_reference_counter.rb             |  52 +++++++++
 lib/gitlab_shell.rb                         |  61 ++++++-----
 lib/names_helper.rb                         |   5 +-
 spec/fixtures/gitlab_config_redis.yml       |  12 +++
 spec/gitlab_access_spec.rb                  |   7 +-
 spec/gitlab_config_spec.rb                  |  14 +--
 spec/gitlab_keys_spec.rb                    |  59 +++++++++-
 spec/gitlab_net_spec.rb                     |  72 ++++++++++---
 spec/gitlab_post_receive_spec.rb            | 161 ++++++++++++++++++++++++----
 spec/gitlab_projects_spec.rb                | 120 ++++++++++++++++-----
 spec/gitlab_reference_counter_spec.rb       |  38 +++++++
 spec/gitlab_shell_spec.rb                   | 146 +++++++++++++++----------
 spec/names_helper_spec.rb                   |   5 +-
 spec/vcr_cassettes/http-access-disabled.yml |  44 ++++++++
 spec/vcr_cassettes/ssh-access-disabled.yml  |  44 ++++++++
 35 files changed, 933 insertions(+), 299 deletions(-)

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