diff options
| author | Nick Thomas <nick@gitlab.com> | 2016-11-03 14:45:55 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2016-11-04 04:01:08 +0000 |
| commit | fa4f904f2564927b58df0a9a046140597c59a8c5 (patch) | |
| tree | f499b744076fad8a9d94cbdde946e0ce020ab066 | |
| parent | c1388d0efb79b755c06b9db19fc4ad47af7cf0a3 (diff) | |
| download | gitlab-ce-fa4f904f2564927b58df0a9a046140597c59a8c5.tar.gz | |
Document multiple repository storage paths
| -rw-r--r-- | doc/administration/img/repository_storages_admin_ui.png | bin | 17081 -> 54043 bytes | |||
| -rw-r--r-- | doc/administration/repository_storages.md | 3 | ||||
| -rw-r--r-- | doc/api/settings.md | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/doc/administration/img/repository_storages_admin_ui.png b/doc/administration/img/repository_storages_admin_ui.png Binary files differindex 599350bc098..6481baca1ad 100644 --- a/doc/administration/img/repository_storages_admin_ui.png +++ b/doc/administration/img/repository_storages_admin_ui.png diff --git a/doc/administration/repository_storages.md b/doc/administration/repository_storages.md index 55b054fc1a4..ab70557b69a 100644 --- a/doc/administration/repository_storages.md +++ b/doc/administration/repository_storages.md @@ -91,6 +91,9 @@ be stored via the **Application Settings** in the Admin area.  +Beginning with GitLab 8.13.4, multiple paths can be chosen. New projects will be +randomly placed on one of the selected paths. + [ce-4578]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4578 [restart gitlab]: restart_gitlab.md#installations-from-source [reconfigure gitlab]: restart_gitlab.md#omnibus-gitlab-reconfigure diff --git a/doc/api/settings.md b/doc/api/settings.md index f7ad3b4cc8e..218546aafea 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -42,6 +42,7 @@ Example response: "sign_in_text" : null, "container_registry_token_expire_delay": 5, "repository_storage": "default", + "repository_storages": ["default"], "koding_enabled": false, "koding_url": null } @@ -73,7 +74,8 @@ PUT /application/settings | `user_oauth_applications` | boolean | no | Allow users to register any application to use GitLab as an OAuth provider | | `after_sign_out_path` | string | no | Where to redirect users after logout | | `container_registry_token_expire_delay` | integer | no | Container Registry token duration in minutes | -| `repository_storage` | string | no | Storage path for new projects. The value should be the name of one of the repository storage paths defined in your gitlab.yml | +| `repository_storages` | array of strings | no | A list of names of enabled storage paths, taken from `gitlab.yml`. New projects will be created in one of these stores, chosen at random. | +| `repository_storage` | string | no | The first entry in `repository_storages`. Deprecated, but retained for compatibility reasons | | `enabled_git_access_protocol` | string | no | Enabled protocols for Git access. Allowed values are: `ssh`, `http`, and `nil` to allow both protocols. | | `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. | |
