diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-05 15:09:05 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-05 15:09:05 +0300 |
commit | a662b146aca7227bc800eed4878000d2b7c9d757 (patch) | |
tree | 8eb9906203b1fda105741b3cc1488a550ebf1962 /lib/gitlab/legacy_github_import | |
parent | 015890a1b77cd90e9ffeb704944d1fb63b0ce555 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/legacy_github_import')
-rw-r--r-- | lib/gitlab/legacy_github_import/importer.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/legacy_github_import/importer.rb b/lib/gitlab/legacy_github_import/importer.rb index e60651300eb..a17e3b1ad5c 100644 --- a/lib/gitlab/legacy_github_import/importer.rb +++ b/lib/gitlab/legacy_github_import/importer.rb @@ -303,6 +303,8 @@ module Gitlab end imported!(resource_type) + rescue ::Octokit::NotFound => e + errors << { type: resource_type, errors: e.message } end def imported?(resource_type) |