diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-04-13 15:27:13 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2016-04-13 15:27:13 +0000 |
| commit | 3463ffde9e3ef425fbaa6093f01212cccb01707b (patch) | |
| tree | c24eaca4bf918b135ed14fa4eddad5239daae3c9 /app/workers | |
| parent | 94e130cec30a8cfa6687d254e1cabce568a22634 (diff) | |
| parent | af25001d462c74bd9bc2470a278a2bafbdefb0b9 (diff) | |
| download | gitlab-ce-3463ffde9e3ef425fbaa6093f01212cccb01707b.tar.gz | |
Merge branch 'push-ref' into 'master'
Fix high CPU usage when PostReceive receives refs/merge-requests/<id>
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12661
See merge request !3651
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/post_receive.rb | 2 |
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 |