Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
c5c41ae0
Commit
c5c41ae0
authored
Jun 10, 2019
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ignore legacy artifact columns in Project Import/Export
Ignore some columns
parent
a0af3458
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
1 deletion
+15
-1
changelogs/unreleased/ignore-artifact-attirbutes-in-project-import-export.yml
...d/ignore-artifact-attirbutes-in-project-import-export.yml
+5
-0
lib/gitlab/import_export/import_export.yml
lib/gitlab/import_export/import_export.yml
+3
-0
lib/gitlab/import_export/relation_factory.rb
lib/gitlab/import_export/relation_factory.rb
+3
-0
spec/lib/gitlab/import_export/project.json
spec/lib/gitlab/import_export/project.json
+4
-1
No files found.
changelogs/unreleased/ignore-artifact-attirbutes-in-project-import-export.yml
0 → 100644
View file @
c5c41ae0
---
title
:
Ignore legacy artifact columns in Project Import/Export
merge_request
:
29427
author
:
type
:
fixed
lib/gitlab/import_export/import_export.yml
View file @
c5c41ae0
...
@@ -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
...
...
lib/gitlab/import_export/relation_factory.rb
View file @
c5c41ae0
...
@@ -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
...
...
spec/lib/gitlab/import_export/project.json
View file @
c5c41ae0
...
@@ -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
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment