summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2015-02-24 05:26:14 +0000
committerMarin Jankovski <marin@gitlab.com>2015-02-24 05:26:14 +0000
commitd1bb9c5cebc9f89d715569582ce9284d72cd7849 (patch)
tree56c3c484b53c5e1b2ee1bae72106c6f92594011a /lib
parent926bef44f0c14a2ef22406c3fe885cd0be2903ae (diff)
parentb0fc24c9bfbcf8a7fdf3723b74810f5615bb4337 (diff)
downloadgitlab-shell-d1bb9c5cebc9f89d715569582ce9284d72cd7849.tar.gz
Merge branch 'fix-post-receive' into 'master'
Return true from GitlabPostReceive to ensure custom hooks run. Fixes https://gitlab.com/gitlab-org/omnibus-gitlab/issues/438. See merge request !62
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab_post_receive.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab_post_receive.rb b/lib/gitlab_post_receive.rb
index 154e045..f7ff153 100644
--- a/lib/gitlab_post_receive.rb
+++ b/lib/gitlab_post_receive.rb
@@ -16,7 +16,7 @@ class GitlabPostReceive
# get value from it
ENV['GL_ID'] = nil
- update_redis
+ result = update_redis
begin
broadcast_message = GitlabNet.new.broadcast_message
@@ -28,6 +28,8 @@ class GitlabPostReceive
rescue GitlabNet::ApiUnreachableError
nil
end
+
+ result
end
protected