diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-11 21:06:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-11 21:06:15 +0300 |
| commit | 0dfbcd8f8b1587a7e10eb79940a8dc13bd72c664 (patch) | |
| tree | 769b7b5eaea4354498ca0b91945e4733895bba43 /doc/administration | |
| parent | cd631619f465a0eee2fe714e720f6b6312dd3e56 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration')
| -rw-r--r-- | doc/administration/geo/replication/index.md | 1 | ||||
| -rw-r--r-- | doc/administration/packages/index.md | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/doc/administration/geo/replication/index.md b/doc/administration/geo/replication/index.md index 518291e8d8c..bcad820531c 100644 --- a/doc/administration/geo/replication/index.md +++ b/doc/administration/geo/replication/index.md @@ -281,6 +281,7 @@ You can keep track of the progress to include the missing items in: | [Container Registry](../../packages/container_registry.md) | Yes | No | | [NPM Registry](../../../user/packages/npm_registry/index.md) | No | No | | [Maven Packages](../../../user/packages/maven_repository/index.md) | No | No | +| [Conan Packages](../../../user/packages/conan_repository/index.md) | No | No | | [External merge request diffs](../../merge_request_diffs.md) | No, if they are on-disk | No | | Content in object storage ([track progress](https://gitlab.com/groups/gitlab-org/-/epics/1526)) | No | No | diff --git a/doc/administration/packages/index.md b/doc/administration/packages/index.md index 99ec5811681..d4afc65577e 100644 --- a/doc/administration/packages/index.md +++ b/doc/administration/packages/index.md @@ -8,6 +8,7 @@ The Packages feature allows GitLab to act as a repository for the following: | Software repository | Description | Available in GitLab version | | ------------------- | ----------- | --------------------------- | +| [Conan Repository](../../user/packages/conan_repository/index.md) | The GitLab Conan Repository enables every project in GitLab to have its own space to store [Conan](https://conan.io/) packages. | 12.4+ | | [Maven Repository](../../user/packages/maven_repository/index.md) | The GitLab Maven Repository enables every project in GitLab to have its own space to store [Maven](https://maven.apache.org/) packages. | 11.3+ | | [NPM Registry](../../user/packages/npm_registry/index.md) | The GitLab NPM Registry enables every project in GitLab to have its own space to store [NPM](https://www.npmjs.com/) packages. | 11.7+ | |