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
401a3bca
Commit
401a3bca
authored
Feb 14, 2019
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix import_jid error on project import
parent
1322146b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
1 deletion
+16
-1
changelogs/unreleased/57579-gitlab-project-import-fails-sidekiq-undefined-method-import_jid.yml
...ject-import-fails-sidekiq-undefined-method-import_jid.yml
+5
-0
lib/gitlab/import_export/shared.rb
lib/gitlab/import_export/shared.rb
+1
-1
spec/lib/gitlab/import_export/shared_spec.rb
spec/lib/gitlab/import_export/shared_spec.rb
+10
-0
No files found.
changelogs/unreleased/57579-gitlab-project-import-fails-sidekiq-undefined-method-import_jid.yml
0 → 100644
View file @
401a3bca
---
title
:
Fix import_jid error on project import
merge_request
:
25239
author
:
type
:
fixed
lib/gitlab/import_export/shared.rb
View file @
401a3bca
...
@@ -61,7 +61,7 @@ module Gitlab
...
@@ -61,7 +61,7 @@ module Gitlab
def
log_base_data
def
log_base_data
{
{
importer:
'Import/Export'
,
importer:
'Import/Export'
,
import_jid:
@project
&
.
import_state
&
.
import_
jid
,
import_jid:
@project
&
.
import_state
&
.
jid
,
project_id:
@project
&
.
id
,
project_id:
@project
&
.
id
,
project_path:
@project
&
.
full_path
project_path:
@project
&
.
full_path
}
}
...
...
spec/lib/gitlab/import_export/shared_spec.rb
View file @
401a3bca
...
@@ -14,6 +14,16 @@ describe Gitlab::ImportExport::Shared do
...
@@ -14,6 +14,16 @@ describe Gitlab::ImportExport::Shared do
expect
(
subject
.
errors
).
to
eq
([
'Error importing into [FILTERED] Permission denied @ unlink_internal - [FILTERED]'
])
expect
(
subject
.
errors
).
to
eq
([
'Error importing into [FILTERED] Permission denied @ unlink_internal - [FILTERED]'
])
end
end
it
'updates the import JID'
do
import_state
=
create
(
:import_state
,
project:
project
,
jid:
'jid-test'
)
expect_next_instance_of
(
Gitlab
::
Import
::
Logger
)
do
|
logger
|
expect
(
logger
).
to
receive
(
:error
).
with
(
hash_including
(
import_jid:
import_state
.
jid
))
end
subject
.
error
(
error
)
end
it
'calls the error logger with the full message'
do
it
'calls the error logger with the full message'
do
expect
(
subject
).
to
receive
(
:log_error
).
with
(
hash_including
(
message:
error
.
message
))
expect
(
subject
).
to
receive
(
:log_error
).
with
(
hash_including
(
message:
error
.
message
))
...
...
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