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/pull_request_review_importer.rb')
-rw-r--r--lib/gitlab/github_import/importer/pull_request_review_importer.rb12
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/gitlab/github_import/importer/pull_request_review_importer.rb b/lib/gitlab/github_import/importer/pull_request_review_importer.rb
index f476ee13392..dd5b7c93ced 100644
--- a/lib/gitlab/github_import/importer/pull_request_review_importer.rb
+++ b/lib/gitlab/github_import/importer/pull_request_review_importer.rb
@@ -69,8 +69,8 @@ module Gitlab
author_id: author_id,
note: note,
system: false,
- created_at: review.submitted_at,
- updated_at: review.submitted_at
+ created_at: submitted_at,
+ updated_at: submitted_at
}.merge(extra)
end
@@ -80,8 +80,8 @@ module Gitlab
approval_attribues = {
merge_request_id: merge_request.id,
user_id: user_id,
- created_at: review.submitted_at,
- updated_at: review.submitted_at
+ created_at: submitted_at,
+ updated_at: submitted_at
}
result = ::Approval.insert(
@@ -105,6 +105,10 @@ module Gitlab
Note.create!(attributes)
end
+
+ def submitted_at
+ @submitted_at ||= (review.submitted_at || merge_request.updated_at)
+ end
end
end
end