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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
a8e24c60
Commit
a8e24c60
authored
Dec 09, 2019
by
Aleksei Lipniagov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Create :correlation_id for `import_failures`
parent
2a267e8c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
lib/gitlab/import_export/relation_tree_restorer.rb
lib/gitlab/import_export/relation_tree_restorer.rb
+1
-1
spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
+3
-1
No files found.
lib/gitlab/import_export/relation_tree_restorer.rb
View file @
a8e24c60
...
@@ -94,7 +94,7 @@ module Gitlab
...
@@ -94,7 +94,7 @@ module Gitlab
relation_index:
relation_index
,
relation_index:
relation_index
,
exception_class:
exception
.
class
.
to_s
,
exception_class:
exception
.
class
.
to_s
,
exception_message:
exception
.
message
.
truncate
(
255
),
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
end
...
...
spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
View file @
a8e24c60
...
@@ -643,7 +643,9 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
...
@@ -643,7 +643,9 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
before
do
before
do
setup_import_export_config
(
'with_invalid_records'
)
setup_import_export_config
(
'with_invalid_records'
)
Labkit
::
Correlation
::
CorrelationId
.
use_id
(
correlation_id
)
{
subject
}
# Import is running from the rake task, `correlation_id` is not assigned
expect
(
Labkit
::
Correlation
::
CorrelationId
).
to
receive
(
:new_id
).
and_return
(
correlation_id
)
subject
end
end
context
'when failures occur because a relation fails to be processed'
do
context
'when failures occur because a relation fails to be processed'
do
...
...
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