diff options
| author | James Lopez <james@gitlab.com> | 2019-06-11 12:54:21 +0000 |
|---|---|---|
| committer | James Lopez <james@gitlab.com> | 2019-06-11 12:54:21 +0000 |
| commit | 0899537e2d3bd4b481bd71c04a0186108ad9c39f (patch) | |
| tree | 5bca6c77dc63ac95fb3f50e3de795f1c78b00c73 /lib | |
| parent | c951798b7173923e43256e57a3db41a297737a05 (diff) | |
| parent | c5c41ae0650da8c6174aa05f1cad1c50e90f713a (diff) | |
| download | gitlab-ce-0899537e2d3bd4b481bd71c04a0186108ad9c39f.tar.gz | |
Merge branch 'ignore-artifact-attirbutes-in-project-import-export' into 'master'
Ignore legacy artifact columns in Project Import/Export
Closes #63033
See merge request gitlab-org/gitlab-ce!29427
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/import_export/import_export.yml | 3 | ||||
| -rw-r--r-- | lib/gitlab/import_export/relation_factory.rb | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index 7bbcb53f016..71c44af9254 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -156,6 +156,9 @@ excluded_attributes: - :when - :artifacts_file - :artifacts_metadata + - :artifacts_file_store + - :artifacts_metadata_store + - :artifacts_size - :commands push_event_payload: - :event_id diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb index e1e70a008d9..efd3f550a22 100644 --- a/lib/gitlab/import_export/relation_factory.rb +++ b/lib/gitlab/import_export/relation_factory.rb @@ -153,6 +153,9 @@ module Gitlab @relation_hash.delete('trace') # old export files have trace @relation_hash.delete('token') @relation_hash.delete('commands') + @relation_hash.delete('artifacts_file_store') + @relation_hash.delete('artifacts_metadata_store') + @relation_hash.delete('artifacts_size') imported_object elsif @relation_name == :merge_requests |