Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/github_import/importer/single_endpoint_issue_events_importer.rb')
-rw-r--r--lib/gitlab/github_import/importer/single_endpoint_issue_events_importer.rb10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/gitlab/github_import/importer/single_endpoint_issue_events_importer.rb b/lib/gitlab/github_import/importer/single_endpoint_issue_events_importer.rb
index 8a9ddfc6ec0..4090555c85e 100644
--- a/lib/gitlab/github_import/importer/single_endpoint_issue_events_importer.rb
+++ b/lib/gitlab/github_import/importer/single_endpoint_issue_events_importer.rb
@@ -22,13 +22,15 @@ module Gitlab
# To make it possible to identify issue in separated worker we need to patch
# Sawyer instances here with issue number
def each_associated(parent_record, associated)
+ associated = associated.to_h
+
compose_associated_id!(parent_record, associated)
return if already_imported?(associated)
Gitlab::GithubImport::ObjectCounter.increment(project, object_type, :fetched)
pull_request = parent_record.is_a? MergeRequest
- associated.issue = { 'number' => parent_record.iid, 'pull_request' => pull_request }
+ associated[:issue] = { number: parent_record.iid, pull_request: pull_request }
yield(associated)
mark_as_imported(associated)
@@ -78,7 +80,7 @@ module Gitlab
end
def id_for_already_imported_cache(event)
- event.id
+ event[:id]
end
def collection_options
@@ -87,9 +89,9 @@ module Gitlab
# Cross-referenced events on Github doesn't have id.
def compose_associated_id!(issuable, event)
- return if event.event != 'cross-referenced'
+ return if event[:event] != 'cross-referenced'
- event.id = "cross-reference##{issuable.iid}-in-#{event.source.issue.id}"
+ event[:id] = "cross-reference##{issuable.iid}-in-#{event.dig(:source, :issue, :id)}"
end
end
end