diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-07-12 11:50:27 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-07-12 11:50:27 +0000 |
commit | 2f83794d2b727594676e25e85ada53e33cf5246a (patch) | |
tree | c42d926778e82bd66783f43f2020b656bda80d61 /doc/api | |
parent | 94627fd7e3b4010e12f7a0698494b2c36c4f76ef (diff) | |
parent | 751e1786dfe727c11ddae28e77be6eb88fbfbbf9 (diff) | |
download | gitlab-ce-2f83794d2b727594676e25e85ada53e33cf5246a.tar.gz |
Merge branch 'dz-manifest-import' into 'master'
Add manifest import
See merge request gitlab-org/gitlab-ce!20304
Diffstat (limited to 'doc/api')
-rw-r--r-- | doc/api/settings.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/api/settings.md b/doc/api/settings.md index e6b207d8746..b6f2101fc7b 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -105,7 +105,7 @@ PUT /application/settings | `housekeeping_gc_period` | integer | no | Number of Git pushes after which 'git gc' is run. | | `housekeeping_incremental_repack_period` | integer | no | Number of Git pushes after which an incremental 'git repack' is run. | | `html_emails_enabled` | boolean | no | Enable HTML emails | -| `import_sources` | Array of strings | no | Sources to allow project import from, possible values: "github bitbucket gitlab google_code fogbugz git gitlab_project | +| `import_sources` | Array of strings | no | Sources to allow project import from, possible values: "github bitbucket gitlab google_code fogbugz git gitlab_project manifest | | `koding_enabled` | boolean | no | Enable Koding integration. Default is `false`. | | `koding_url` | string | yes (if `koding_enabled` is `true`) | The Koding instance URL for integration. | | `max_artifacts_size` | integer | no | Maximum artifacts size in MB | |