Use update hook to add post event to redis. Use GL_ID instead of GL_USER

2 files changed, 5 insertions, 10 deletions

diff --git a/hooks/post-receive b/hooks/post-receive
index ebd9e1a..acb1e40 100755
--- a/hooks/post-receive
+++ b/hooks/post-receive
@@ -1,11 +1,6 @@
-#!/usr/bin/env bash
+#!/usr/bin/env ruby
 
-# This file was placed here by GitLab. It makes sure that your pushed commits
-# will be processed properly.
+# This file was placed here by GitLab.
+# IT IS DEPRECATED NOW.
+# All GitLab logic handled by update hook
 
-while read oldrev newrev ref
-do
-  # For every branch or tag that was pushed, create a Resque job in redis.
-  repo_path=`pwd`
-  env -i redis-cli rpush "resque:gitlab:queue:post_receive" "{\"class\":\"PostReceive\",\"args\":[\"$repo_path\",\"$oldrev\",\"$newrev\",\"$ref\",\"$GL_USER\"]}" > /dev/null 2>&1
-done
diff --git a/hooks/update b/hooks/update
index f483cc0..39ea196 100755
--- a/hooks/update
+++ b/hooks/update
@@ -4,7 +4,7 @@
 # will be processed properly.
 
 refname = ARGV[0]
-key_id  = ENV['GL_USER']
+key_id  = ENV['GL_ID']
 repo_path = `pwd`
 
 require_relative '../lib/gitlab_update'