Commit 0899537e authored by James Lopez's avatar James Lopez

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
parents c951798b c5c41ae0
---
title: Ignore legacy artifact columns in Project Import/Export
merge_request: 29427
author:
type: fixed
...@@ -156,6 +156,9 @@ excluded_attributes: ...@@ -156,6 +156,9 @@ excluded_attributes:
- :when - :when
- :artifacts_file - :artifacts_file
- :artifacts_metadata - :artifacts_metadata
- :artifacts_file_store
- :artifacts_metadata_store
- :artifacts_size
- :commands - :commands
push_event_payload: push_event_payload:
- :event_id - :event_id
......
...@@ -153,6 +153,9 @@ module Gitlab ...@@ -153,6 +153,9 @@ module Gitlab
@relation_hash.delete('trace') # old export files have trace @relation_hash.delete('trace') # old export files have trace
@relation_hash.delete('token') @relation_hash.delete('token')
@relation_hash.delete('commands') @relation_hash.delete('commands')
@relation_hash.delete('artifacts_file_store')
@relation_hash.delete('artifacts_metadata_store')
@relation_hash.delete('artifacts_size')
imported_object imported_object
elsif @relation_name == :merge_requests elsif @relation_name == :merge_requests
......
...@@ -6223,7 +6223,10 @@ ...@@ -6223,7 +6223,10 @@
"erased_by_id": null, "erased_by_id": null,
"erased_at": null, "erased_at": null,
"type": "Ci::Build", "type": "Ci::Build",
"token": "abcd" "token": "abcd",
"artifacts_file_store": 1,
"artifacts_metadata_store": 1,
"artifacts_size": 10
}, },
{ {
"id": 72, "id": 72,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment