diff options
| author | Ahmad Sherif <me@ahmadsherif.com> | 2016-10-27 15:00:31 +0200 |
|---|---|---|
| committer | Ahmad Sherif <me@ahmadsherif.com> | 2016-10-28 11:30:20 +0200 |
| commit | f68d9261b0fa09c03ef8b92d8941d3b6577d9a2a (patch) | |
| tree | 209626dbad9c7d7c36e219b0f23c688183cc6fed | |
| parent | 07275dd79ccfe57c495ccd64ff5632b4fb003b9b (diff) | |
| download | gitlab-ce-fix/make-github-import-retryable.tar.gz | |
Fix typosfix/make-github-import-retryable
| -rw-r--r-- | lib/gitlab/github_import/client.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/github_import/importer.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/github_import/client.rb b/lib/gitlab/github_import/client.rb index 348005d5659..85df6547a67 100644 --- a/lib/gitlab/github_import/client.rb +++ b/lib/gitlab/github_import/client.rb @@ -110,7 +110,7 @@ module Gitlab if block_given? yield data # api.last_response could change while we're yielding (e.g. fetching labels for each PR) - # so we cache our own last request + # so we cache our own last response each_response_page(last_response, &block) else each_response_page(last_response) { |page| data.concat(page) } diff --git a/lib/gitlab/github_import/importer.rb b/lib/gitlab/github_import/importer.rb index 6c4f5acccb4..ecc28799737 100644 --- a/lib/gitlab/github_import/importer.rb +++ b/lib/gitlab/github_import/importer.rb @@ -203,7 +203,7 @@ module Gitlab # No matching resource in the collection, which means we got halted right on the end of the last page, so all good return unless cut_off_index - # Otherwise, remove the resouces we've already inserted + # Otherwise, remove the resources we've already inserted comments.shift(cut_off_index + 1) end |