diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-04 16:25:48 +0200 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-04 16:28:40 +0200 |
| commit | 01e0e2d7f8c4e4d2d78b61916fcf2e69464e5760 (patch) | |
| tree | 70b7904fc2bbc9b20871a1120e49b59a64f7bc72 | |
| parent | c899ee585ba5f18ab5bfcbf9c57e4025c14aa137 (diff) | |
| download | gitlab-ce-01e0e2d7f8c4e4d2d78b61916fcf2e69464e5760.tar.gz | |
Fix import export
| -rw-r--r-- | lib/gitlab/import_export/import_export.yml | 1 | ||||
| -rw-r--r-- | lib/gitlab/import_export/relation_factory.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index f69f98a78a3..5354c220b4e 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -129,6 +129,7 @@ excluded_attributes: - :when - :artifacts_file - :artifacts_metadata + - :commands push_event_payload: - :event_id project_badges: diff --git a/lib/gitlab/import_export/relation_factory.rb b/lib/gitlab/import_export/relation_factory.rb index 81807ed659c..53821aba07f 100644 --- a/lib/gitlab/import_export/relation_factory.rb +++ b/lib/gitlab/import_export/relation_factory.rb @@ -144,6 +144,7 @@ module Gitlab if BUILD_MODELS.include?(@relation_name) @relation_hash.delete('trace') # old export files have trace @relation_hash.delete('token') + @relation_hash.delete('commands') imported_object elsif @relation_name == :merge_requests |