From b6f28a177ede2fcd0ab746efee770a2c7a6f62ae Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Wed, 8 Jun 2016 12:27:35 +0000 Subject: [PATCH] Merge branch 'gh-disable-webhooks' into 'master' Check if GitHub rate limite API was reached before update Webhooks ## What does this MR do? Checks if the job needs to sleep, and wait for the rate limit to be reseted before update each Webhook. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? The import process can fail if the API rate limit was reached during the import process. ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/17498 ## Screenshots (if relevant) Not relevant. See merge request !4509 --- lib/gitlab/github_import/importer.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb index 442b4c389f..5ef9d66ba6 100644 --- a/lib/gitlab/github_import/importer.rb +++ b/lib/gitlab/github_import/importer.rb @@ -146,6 +146,7 @@ module Gitlab def update_webhooks(hooks, options) hooks.each do |hook| + sleep rate_limit_sleep_time if rate_limit_exceed? client.edit_hook(repo, hook.id, hook.name, hook.config, options) end end