summaryrefslogtreecommitdiff
path: root/app/workers
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2016-04-13 17:38:59 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2016-04-13 17:38:59 +0200
commitf07316f27cc1a5d354bc82b4caa1de703a3bcb5e (patch)
tree68c8f99f8df9375c9644993cf0bbd2f92cf9bfdd /app/workers
parent6f6d2d0ad5039fa8ace7e09c4f5867bb680b0f79 (diff)
parent3463ffde9e3ef425fbaa6093f01212cccb01707b (diff)
downloadgitlab-ce-f07316f27cc1a5d354bc82b4caa1de703a3bcb5e.tar.gz
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/post_receive.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/workers/post_receive.rb b/app/workers/post_receive.rb
index 3cc232ef1ae..9e1215b21a6 100644
--- a/app/workers/post_receive.rb
+++ b/app/workers/post_receive.rb
@@ -40,7 +40,7 @@ class PostReceive
if Gitlab::Git.tag_ref?(ref)
GitTagPushService.new.execute(post_received.project, @user, oldrev, newrev, ref)
- else
+ elsif Gitlab::Git.branch_ref?(ref)
GitPushService.new(post_received.project, @user, oldrev: oldrev, newrev: newrev, ref: ref).execute
end
end