Skip to content

G
gitlab-ce
Commit 03188f67 authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

Resolve lib/gitlab/import_export/import_export.yml 

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 7aca7df5
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
lib/gitlab/import_export/import_export.yml
View file @ 03188f67
...@@ -122,7 +122,6 @@ excluded_attributes: ...@@ -122,7 +122,6 @@ excluded_attributes:
- :mirror_overwrites_diverged_branches - :mirror_overwrites_diverged_branches
- :description_html - :description_html
- :repository_languages - :repository_languages
<<<<<<< HEAD
- :packages_enabled - :packages_enabled
- :mirror_last_update_at - :mirror_last_update_at
- :mirror_last_successful_update_at - :mirror_last_successful_update_at
...@@ -131,11 +130,6 @@ excluded_attributes: ...@@ -131,11 +130,6 @@ excluded_attributes:
- :jid - :jid
- :last_update_at - :last_update_at
- :last_successful_update_at - :last_successful_update_at
=======
project_import_state:
- :last_error
- :jid
>>>>>>> upstream/master
prometheus_metrics: prometheus_metrics:
- :common - :common
- :identifier - :identifier
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7