Commit 890d7b54 authored by James Lopez's avatar James Lopez

update docs

parent 0abd85f9
...@@ -43,6 +43,7 @@ following locations: ...@@ -43,6 +43,7 @@ following locations:
- [Pipeline Schedules](pipeline_schedules.md) - [Pipeline Schedules](pipeline_schedules.md)
- [Projects](projects.md) including setting Webhooks - [Projects](projects.md) including setting Webhooks
- [Project Access Requests](access_requests.md) - [Project Access Requests](access_requests.md)
- [Project import/export](project_import_export.md)
- [Project Members](members.md) - [Project Members](members.md)
- [Project Snippets](project_snippets.md) - [Project Snippets](project_snippets.md)
- [Protected Branches](protected_branches.md) - [Protected Branches](protected_branches.md)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
[Introduced][ce-41899] in GitLab 10.6 [Introduced][ce-41899] in GitLab 10.6
[Project import/export](../user/project/settings/import_export.md) [See also the project import/export documentation](../user/project/settings/import_export.md)
## Import a file ## Import a file
...@@ -12,7 +12,7 @@ POST /projects/import ...@@ -12,7 +12,7 @@ POST /projects/import
| Attribute | Type | Required | Description | | Attribute | Type | Required | Description |
| --------- | -------------- | -------- | ---------------------------------------- | | --------- | -------------- | -------- | ---------------------------------------- |
| `namespace` | integer/string | no | The ID or path of the namespace that the project will be imported to. Defaults to the user's namespace | | `namespace` | integer/string | no | The ID or path of the namespace that the project will be imported to. Defaults to the current user's namespace |
| `file` | string | yes | The file to be uploaded | | `file` | string | yes | The file to be uploaded |
| `path` | string | yes | Name and path for new project | | `path` | string | yes | Name and path for new project |
...@@ -56,7 +56,7 @@ curl --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/a ...@@ -56,7 +56,7 @@ curl --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/a
Status can be one of `none`, `scheduled`, `failed`, `started`, or `finished`. Status can be one of `none`, `scheduled`, `failed`, `started`, or `finished`.
If the status is `failed`, it will include the import error message. If the status is `failed`, it will include the import error message under `import_error`.
```json ```json
{ {
......
...@@ -1328,7 +1328,7 @@ Read more in the [Branches](branches.md) documentation. ...@@ -1328,7 +1328,7 @@ Read more in the [Branches](branches.md) documentation.
## Project Import/Export ## Project Import/Export
Read more in the [Project export](project_import_export.md) documentation. Read more in the [Project import/export](project_import_export.md) documentation.
## Project members ## Project members
......
...@@ -24,7 +24,7 @@ module API ...@@ -24,7 +24,7 @@ module API
params do params do
requires :path, type: String, desc: 'The new project path and name' requires :path, type: String, desc: 'The new project path and name'
requires :file, type: File, desc: 'The project export file to be imported' requires :file, type: File, desc: 'The project export file to be imported'
optional :namespace, type: String, desc: 'The ID or name of the namespace that the project will be imported into. Defaults to the user namespace.' optional :namespace, type: String, desc: "The ID or name of the namespace that the project will be imported into. Defaults to the current user's namespace."
end end
desc 'Create a new project import' do desc 'Create a new project import' do
detail 'This feature was introduced in GitLab 10.6.' detail 'This feature was introduced in GitLab 10.6.'
......
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