diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 03:07:56 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 03:07:56 +0000 |
| commit | 4560c92ab1954cf0416bafc45d1fa671fcacb3c3 (patch) | |
| tree | 4b70c6b61345b2df075918cab6314d41b46cf80e /doc/user/packages | |
| parent | 6348b76e4b4dd4e398915c3150c1d02aafa3f13b (diff) | |
| download | gitlab-ce-4560c92ab1954cf0416bafc45d1fa671fcacb3c3.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/packages')
| -rw-r--r-- | doc/user/packages/conan_repository/index.md | 2 | ||||
| -rw-r--r-- | doc/user/packages/maven_repository/index.md | 2 | ||||
| -rw-r--r-- | doc/user/packages/npm_registry/index.md | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/user/packages/conan_repository/index.md b/doc/user/packages/conan_repository/index.md index 3b993303391..aa81b3d056e 100644 --- a/doc/user/packages/conan_repository/index.md +++ b/doc/user/packages/conan_repository/index.md @@ -268,7 +268,7 @@ The GitLab Conan repository supports the following Conan CLI commands: > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/11678) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.7. -To work with Conan commands within [GitLab CI](./../../../ci/README.md), you can use +To work with Conan commands within [GitLab CI/CD](./../../../ci/README.md), you can use `CI_JOB_TOKEN` in place of the personal access token in your commands. It is easiest to provide the `CONAN_LOGIN_USERNAME` and `CONAN_PASSWORD` with each diff --git a/doc/user/packages/maven_repository/index.md b/doc/user/packages/maven_repository/index.md index f4e2b71dd3c..58f0f46052d 100644 --- a/doc/user/packages/maven_repository/index.md +++ b/doc/user/packages/maven_repository/index.md @@ -481,7 +481,7 @@ Docker container), and Maven will utilize the configured CI ### Useful Maven command line options There's some [maven command line options](https://maven.apache.org/ref/current/maven-embedder/cli.html) -which maybe useful when doing tasks with GitLab CI. +which maybe useful when doing tasks with GitLab CI/CD. - File transfer progress can make the CI logs hard to read. Option `-ntp,--no-transfer-progress` was added in diff --git a/doc/user/packages/npm_registry/index.md b/doc/user/packages/npm_registry/index.md index e5cd45ee707..373e399d56f 100644 --- a/doc/user/packages/npm_registry/index.md +++ b/doc/user/packages/npm_registry/index.md @@ -285,7 +285,7 @@ page. ## Publishing a package with CI/CD -To work with NPM commands within [GitLab CI](./../../../ci/README.md), you can use +To work with NPM commands within [GitLab CI/CD](./../../../ci/README.md), you can use `CI_JOB_TOKEN` in place of the personal access token in your commands. A simple example `.gitlab-ci.yml` file for publishing NPM packages: |