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
This commit is contained in:
James Lopez 2019-06-11 12:54:21 +00:00
commit 0899537e2d
4 changed files with 15 additions and 1 deletions

View File

@ -0,0 +1,5 @@
---
title: Ignore legacy artifact columns in Project Import/Export
merge_request: 29427
author:
type: fixed

View File

@ -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

View File

@ -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

View File

@ -6223,7 +6223,10 @@
"erased_by_id": null,
"erased_at": null,
"type": "Ci::Build",
"token": "abcd"
"token": "abcd",
"artifacts_file_store": 1,
"artifacts_metadata_store": 1,
"artifacts_size": 10
},
{
"id": 72,