diff options
Diffstat (limited to 'lib/gitlab/github_import/importer/diff_note_importer.rb')
| -rw-r--r-- | lib/gitlab/github_import/importer/diff_note_importer.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/gitlab/github_import/importer/diff_note_importer.rb b/lib/gitlab/github_import/importer/diff_note_importer.rb index 44ffcd7a1e4..d49180e6927 100644 --- a/lib/gitlab/github_import/importer/diff_note_importer.rb +++ b/lib/gitlab/github_import/importer/diff_note_importer.rb @@ -36,13 +36,6 @@ module Gitlab Logger.warn(message: e.message, 'error.class': e.class.name) import_with_legacy_diff_note - rescue ActiveRecord::InvalidForeignKey => e - # It's possible the project and the issue have been deleted since - # scheduling this job. In this case we'll just skip creating the note - Logger.info( - message: e.message, - github_identifiers: note.github_identifiers - ) end private @@ -71,6 +64,7 @@ module Gitlab discussion_id: note.discussion_id, noteable_id: merge_request_id, project_id: project.id, + namespace_id: project.project_namespace_id, author_id: author_id, note: note_body, commit_id: note.original_commit_id, @@ -132,7 +126,7 @@ module Gitlab Logger.info( project_id: project.id, importer: self.class.name, - github_identifiers: note.github_identifiers, + external_identifiers: note.github_identifiers, model: model ) end |