diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-30 03:09:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-30 03:09:09 +0300 |
commit | c36e59283ebcfd75281a9dda227ed060eeb5fbe7 (patch) | |
tree | 282c293bb93f3fc7798485b2410c47fdbf2cd50a /doc | |
parent | 27d314277bfe7fffec215efa9b1833a23bb82940 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r-- | doc/ci/chatops/README.md | 4 | ||||
-rw-r--r-- | doc/ci/ci_cd_for_external_repos/github_integration.md | 2 | ||||
-rw-r--r-- | doc/ci/docker/using_docker_build.md | 2 | ||||
-rw-r--r-- | doc/development/documentation/workflow.md | 2 | ||||
-rw-r--r-- | doc/development/kubernetes.md | 4 | ||||
-rw-r--r-- | doc/development/scalability.md | 2 | ||||
-rw-r--r-- | doc/user/gitlab_com/index.md | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/doc/ci/chatops/README.md b/doc/ci/chatops/README.md index ec3d13e7500..799ace903b2 100644 --- a/doc/ci/chatops/README.md +++ b/doc/ci/chatops/README.md @@ -23,7 +23,7 @@ A new `run` action has been added to the [slash commands](../../integration/slas After the job has finished, its output is sent back to Slack provided it has completed within 30 minutes. If a job takes more than 30 minutes to run it must use the Slack API to manually send data back to a channel. -[Developer access and above](../../user/permissions.html#project-members-permissions) is required to use the `run` command. If a job should not be able to be triggered from chat, it can be set to `except: [chat]`. +[Developer access and above](../../user/permissions.md#project-members-permissions) is required to use the `run` command. If a job should not be able to be triggered from chat, it can be set to `except: [chat]`. ## Creating a ChatOps CI job @@ -31,7 +31,7 @@ Since ChatOps is built upon GitLab CI/CD, the job has all the same features and - It is strongly recommended to set `only: [chat]` so the job does not run as part of the standard CI pipeline. - If the job is set to `when: manual`, the pipeline will be created however the job will wait to be started. -- It is important to keep in mind that there is limited support for access control. If the user who triggered the slash command is a developer in the project, the job will run. The job itself can utilize existing [CI/CD variables](../variables/README.html#predefined-environment-variables) like `GITLAB_USER_ID` to perform additional rights validation, however these variables can be [overridden](../variables/README.html#priority-of-environment-variables). +- It is important to keep in mind that there is limited support for access control. If the user who triggered the slash command is a developer in the project, the job will run. The job itself can utilize existing [CI/CD variables](../variables/README.md#predefined-environment-variables) like `GITLAB_USER_ID` to perform additional rights validation, however these variables can be [overridden](../variables/README.md#priority-of-environment-variables). ### Controlling the ChatOps reply diff --git a/doc/ci/ci_cd_for_external_repos/github_integration.md b/doc/ci/ci_cd_for_external_repos/github_integration.md index 3df47d4cd4f..7d2b17afe31 100644 --- a/doc/ci/ci_cd_for_external_repos/github_integration.md +++ b/doc/ci/ci_cd_for_external_repos/github_integration.md @@ -13,7 +13,7 @@ Watch a video on [Using GitLab CI/CD pipelines with GitHub repositories](https:/ NOTE: **Note:** Because of [GitHub limitations](https://gitlab.com/gitlab-org/gitlab/issues/9147), -[GitHub OAuth](../../integration/github.html#enabling-github-oauth) +[GitHub OAuth](../../integration/github.md#enabling-github-oauth) cannot be used to authenticate with GitHub as an external CI/CD repository. ## Connect with Personal Access Token diff --git a/doc/ci/docker/using_docker_build.md b/doc/ci/docker/using_docker_build.md index c892320327b..b7d708b152e 100644 --- a/doc/ci/docker/using_docker_build.md +++ b/doc/ci/docker/using_docker_build.md @@ -152,7 +152,7 @@ This requires GitLab Runner 11.11 or higher. The Docker daemon supports connection over TLS and it's done by default for Docker 19.03.1 or higher. This is the **suggested** way to use the docker-in-docker service and -[GitLab.com Shared Runners](../../user/gitlab_com/index.html#shared-runners) +[GitLab.com Shared Runners](../../user/gitlab_com/index.md#shared-runners) support this. 1. Install [GitLab Runner](https://docs.gitlab.com/runner/install/). diff --git a/doc/development/documentation/workflow.md b/doc/development/documentation/workflow.md index 0e5da29df94..137955d79b3 100644 --- a/doc/development/documentation/workflow.md +++ b/doc/development/documentation/workflow.md @@ -208,7 +208,7 @@ code reviewer have ensured: ### When documentation is required -Documentation [is required](../contributing/merge_request_workflow.html#definition-of-done) for a +Documentation [is required](../contributing/merge_request_workflow.md#definition-of-done) for a milestone when: - A new or enhanced feature is shipped that impacts the user or administrator experience. diff --git a/doc/development/kubernetes.md b/doc/development/kubernetes.md index a0dd97f2a1c..db06ddf352f 100644 --- a/doc/development/kubernetes.md +++ b/doc/development/kubernetes.md @@ -170,7 +170,7 @@ kubectl logs <pod_name> --follow -n gitlab-managed-apps ## GitLab Managed Apps -GitLab provides [GitLab Managed Apps](../user/clusters/applications.html), a one-click install for various applications which can be added directly to your configured cluster. +GitLab provides [GitLab Managed Apps](../user/clusters/applications.md), a one-click install for various applications which can be added directly to your configured cluster. **<i class="fa fa-youtube-play youtube" aria-hidden="true"></i> -For an overview of how to add a new GitLab-mananged app, see [How to add GitLab-managed-apps to Kubernetes integration](https://youtu.be/mKm-jkranEk).** +For an overview of how to add a new GitLab-managed app, see [How to add GitLab-managed-apps to Kubernetes integration](https://youtu.be/mKm-jkranEk).** diff --git a/doc/development/scalability.md b/doc/development/scalability.md index cc86a4b91a0..d4772bf3ea5 100644 --- a/doc/development/scalability.md +++ b/doc/development/scalability.md @@ -96,7 +96,7 @@ A recent [database checkup shows a breakdown of the table sizes on GitLab.com](https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/8022#master-1022016101-8). Since `merge_request_diff_files` contains over 1 TB of data, we will want to reduce/eliminate this table first. GitLab has support for [storing diffs in -object storage](../administration/merge_request_diffs.html), which we [will +object storage](../administration/merge_request_diffs.md), which we [will want to do on GitLab.com](https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/7356). diff --git a/doc/user/gitlab_com/index.md b/doc/user/gitlab_com/index.md index 50337be6340..dd6ee4175bc 100644 --- a/doc/user/gitlab_com/index.md +++ b/doc/user/gitlab_com/index.md @@ -282,7 +282,7 @@ Windows Shared Runners: ```yaml .shared_windows_runners: tags: - - shared + - shared-windows - windows - windows-1809 |