diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-10 15:07:55 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-10 15:07:55 +0300 |
| commit | 5e11c9b77cb1b2b77ee29359047b55807afe255d (patch) | |
| tree | 40b02dead6acdcaab9cc15efc9ae4710c2ed78a8 /lib/gitlab/import_export | |
| parent | 97d4d926630822d0e1a638206909679c962d2f0a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/import_export')
| -rw-r--r-- | lib/gitlab/import_export/import_export.yml | 1 | ||||
| -rw-r--r-- | lib/gitlab/import_export/relation_tree_restorer.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/import_export/import_export.yml b/lib/gitlab/import_export/import_export.yml index 64bf40b50c2..b3a1d472e73 100644 --- a/lib/gitlab/import_export/import_export.yml +++ b/lib/gitlab/import_export/import_export.yml @@ -29,6 +29,7 @@ tree: - :priorities - :issue_assignees - :zoom_meetings + - :sentry_issue - snippets: - :award_emoji - notes: diff --git a/lib/gitlab/import_export/relation_tree_restorer.rb b/lib/gitlab/import_export/relation_tree_restorer.rb index 15d1f8a8148..8a2b0cab915 100644 --- a/lib/gitlab/import_export/relation_tree_restorer.rb +++ b/lib/gitlab/import_export/relation_tree_restorer.rb @@ -94,7 +94,7 @@ module Gitlab relation_index: relation_index, exception_class: exception.class.to_s, exception_message: exception.message.truncate(255), - correlation_id_value: Labkit::Correlation::CorrelationId.current_id + correlation_id_value: Labkit::Correlation::CorrelationId.current_or_new_id ) end |