diff --git a/lib/gitlab/github_import/client.rb b/lib/gitlab/github_import/client.rb index 348005d5659cd67b9423afa20a74c0758e7f937f..85df6547a673d61b77fc5eb7af0b7f86c0f21c98 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 6c4f5acccb4d88072a7b522684748a8c1cf433f4..ecc28799737b4c06f14371c8dc129225bdca5cc3 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