[DRE-commits] [gitlab-shell] 03/03: refresh patches

[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 ccf1b96fcc8a347b82a0690987a9b98a57899a8f
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Oct 31 15:20:59 2016 +0530

    refresh patches
---
 debian/changelog                     |  3 ++-
 debian/patches/use-system-libs.patch | 12 +++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6564924..478a911 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gitlab-shell (3.6.6-1) unstable; urgency=medium
 
-  * New upstream release 
+  * New upstream release
+  * Refresh patches
 
  -- Pirate Praveen <praveen at debian.org>  Mon, 31 Oct 2016 15:18:08 +0530
 
diff --git a/debian/patches/use-system-libs.patch b/debian/patches/use-system-libs.patch
index 6ead5da..ae0cb22 100644
--- a/debian/patches/use-system-libs.patch
+++ b/debian/patches/use-system-libs.patch
@@ -18,15 +18,17 @@ Index: gitlab-shell/bin/create-hooks
 ===================================================================
 --- gitlab-shell.orig/bin/create-hooks
 +++ gitlab-shell/bin/create-hooks
-@@ -4,8 +4,9 @@
+@@ -4,9 +4,10 @@
  #
  # This script is used when restoring a GitLab backup.
  
 -require_relative '../lib/gitlab_init'
 -require File.join(ROOT_PATH, 'lib', 'gitlab_projects')
+-require File.join(ROOT_PATH, 'lib', 'gitlab_metrics')
 +$:.unshift File.expand_path('../lib', __FILE__)
 +require 'gitlab_init'
 +require 'gitlab_projects'
++require 'gitlab_metrics'
  
  repository_storage_paths = ARGV
  
@@ -124,20 +126,20 @@ Index: gitlab-shell/hooks/post-receive
 +require 'gitlab_post_receive'
  
  if GitlabPostReceive.new(repo_path, key_id, refs).exec &&
-     GitlabCustomHook.new.post_receive(refs, repo_path)
+     GitlabCustomHook.new(key_id).post_receive(refs, repo_path)
 Index: gitlab-shell/hooks/update
 ===================================================================
 --- gitlab-shell.orig/hooks/update
 +++ gitlab-shell/hooks/update
-@@ -8,7 +8,8 @@ old_value = ARGV[1]
- new_value = ARGV[2]
+@@ -9,7 +9,8 @@ new_value = ARGV[2]
  repo_path = Dir.pwd
+ key_id    = ENV.delete('GL_ID')
  
 -require_relative '../lib/gitlab_custom_hook'
 +$:.unshift File.expand_path('../lib', __FILE__)
 +require 'gitlab_custom_hook'
  
- if GitlabCustomHook.new.update(ref_name, old_value, new_value, repo_path)
+ if GitlabCustomHook.new(key_id).update(ref_name, old_value, new_value, repo_path)
    exit 0
 Index: gitlab-shell/hooks/pre-receive
 ===================================================================

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