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
cb8ab3ab
Commit
cb8ab3ab
authored
Apr 03, 2020
by
Matthias Kaeppler
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Expose correlation_id in import_status resource
parent
27be1000
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
doc/api/project_import_export.md
doc/api/project_import_export.md
+4
-2
lib/api/entities/project_import_status.rb
lib/api/entities/project_import_status.rb
+3
-0
No files found.
doc/api/project_import_export.md
View file @
cb8ab3ab
...
...
@@ -172,7 +172,8 @@ requests.post(url, headers=headers, data=data, files=files)
"path"
:
"api-project"
,
"path_with_namespace"
:
"root/api-project"
,
"created_at"
:
"2018-02-13T09:05:58.023Z"
,
"import_status"
:
"scheduled"
"import_status"
:
"scheduled"
,
"correlation_id"
:
"mezklWso3Za"
}
```
...
...
@@ -211,6 +212,7 @@ If the status is `failed`, it will include the import error message under `impor
"path"
:
"gitlab-test"
,
"path_with_namespace"
:
"gitlab-org/gitlab-test"
,
"created_at"
:
"2017-08-29T04:36:44.383Z"
,
"import_status"
:
"started"
"import_status"
:
"started"
,
"correlation_id"
:
"mezklWso3Za"
}
```
lib/api/entities/project_import_status.rb
View file @
cb8ab3ab
...
...
@@ -4,6 +4,9 @@ module API
module
Entities
class
ProjectImportStatus
<
ProjectIdentity
expose
:import_status
expose
:correlation_id
do
|
project
,
_options
|
project
.
import_state
.
correlation_id
end
# TODO: Use `expose_nil` once we upgrade the grape-entity gem
expose
:import_error
,
if:
lambda
{
|
project
,
_ops
|
project
.
import_state
&
.
last_error
}
do
|
project
|
...
...
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