summaryrefslogtreecommitdiff
path: root/app/workers
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-04-11 12:46:19 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-04-11 12:46:19 +0200
commit667d44c25ccefb511fc0d206eaa5990117032236 (patch)
tree16c3bbe143b9c046685a34326171e5e754765b45 /app/workers
parent986b4a54ee159de56a7ebe51327887b49474813b (diff)
downloadgitlab-ce-667d44c25ccefb511fc0d206eaa5990117032236.tar.gz
Fix high CPU usage when PostReceive receives refs/merge-requests/<id>push-ref
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