Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 0 deletions

diff --git a/doc/development/bitbucket_cloud_importer.md b/doc/development/bitbucket_cloud_importer.md
index 98620ca39eb..bab93f5075e 100644
--- a/doc/development/bitbucket_cloud_importer.md
+++ b/doc/development/bitbucket_cloud_importer.md
@@ -65,6 +65,11 @@ For every issue, a job for the `Gitlab::BitbucketImport::ImportIssueNotesWorker`
 This worker completes the import process by performing some housekeeping
 such as marking the import as completed.
 
+## Backoff and retry
+
+In order to handle rate limiting, requests are wrapped with `Bitbucket::ExponentialBackoff`.
+This wrapper catches rate limit errors and retries after a delay up to three times.
+
 ## Set up Bitbucket authentication on GDK
 
 To set up Bitbucket authentication on GDK:
diff --git a/doc/development/bitbucket_server_importer.md b/doc/development/bitbucket_server_importer.md
index 3a1f5a4febd..f1a91020594 100644
--- a/doc/development/bitbucket_server_importer.md
+++ b/doc/development/bitbucket_server_importer.md
@@ -82,3 +82,8 @@ same email does not exist on GitLab, this can lead to incorrect users being tagg
 
 To get around this, we build a cache containing all users who have access to the Bitbucket
 project and then convert mentions in pull request descriptions and notes.
+
+## Backoff and retry
+
+In order to handle rate limiting, requests are wrapped with `BitbucketServer::RetryWithDelay`.
+This wrapper checks if the response is rate limited and retries once after the delay specified in the response headers.