diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-16 15:12:38 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-16 15:12:38 +0300 |
| commit | 93fb07b8c9edb0f3e860d7670b47e03a136d1a57 (patch) | |
| tree | 3a0def9b247850b5510e11faafd628101bb9c06f /lib/gitlab/import_export | |
| parent | d75ac09b4a880ba2d36d510a5720dd550b0809e9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/import_export')
| -rw-r--r-- | lib/gitlab/import_export/base/relation_factory.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/import_export/project/import_export.yml | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/base/relation_factory.rb b/lib/gitlab/import_export/base/relation_factory.rb index ee24d51a0cd..1cbfcbdb595 100644 --- a/lib/gitlab/import_export/base/relation_factory.rb +++ b/lib/gitlab/import_export/base/relation_factory.rb @@ -129,7 +129,7 @@ module Gitlab # When an assignee (or any other listed association) did not exist in the members mapper, the importer is # assigned. We only need to assign each user once. def remove_duplicate_assignees - associations = %w[issue_assignees merge_request_assignees merge_request_reviewers] + associations = %w[issue_assignees merge_request_assignees merge_request_reviewers approvals] associations.each do |association| next unless @relation_hash.key?(association) diff --git a/lib/gitlab/import_export/project/import_export.yml b/lib/gitlab/import_export/project/import_export.yml index 8168e8dc227..c5b8f3fd35b 100644 --- a/lib/gitlab/import_export/project/import_export.yml +++ b/lib/gitlab/import_export/project/import_export.yml @@ -53,6 +53,7 @@ tree: - project_members: - :user - merge_requests: + - :approvals - :metrics - :award_emoji - :merge_request_assignees @@ -122,6 +123,10 @@ included_attributes: - :username author: - :name + approvals: + - :user_id + - :created_at + - :updated_at ci_cd_settings: - :group_runners_enabled - :runner_token_expiration_interval @@ -776,6 +781,9 @@ excluded_attributes: - :repository_size_limit - :external_webhook_token - :incident_management_issuable_escalation_statuses + approvals: + - :id + - :merge_request_id namespaces: - :runners_token - :runners_token_encrypted |