diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-21 09:09:34 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-21 09:09:34 +0000 |
| commit | 5bd4297fd759a14ad9ab9232cb985d28bf44ac49 (patch) | |
| tree | 6c970916f6e8ec494a5631f6defe41a5cd206f93 /doc | |
| parent | 51da0a2d3976111b19d2996591e08bea5111beb3 (diff) | |
| download | gitlab-ce-5bd4297fd759a14ad9ab9232cb985d28bf44ac49.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ci/yaml/README.md | 2 | ||||
| -rw-r--r-- | doc/development/telemetry/usage_ping.md | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md index 996e58eddd2..1b18561ff11 100644 --- a/doc/ci/yaml/README.md +++ b/doc/ci/yaml/README.md @@ -1275,7 +1275,7 @@ check the value of the `$CI_PIPELINE_SOURCE` variable. | `schedule` | For [scheduled pipelines](../pipelines/schedules.md). | | `api` | For pipelines triggered by the [pipelines API](../../api/pipelines.md#create-a-new-pipeline). | | `external` | When using CI services other than GitLab. | -| `pipelines` | For multi-project pipelines created by [using the API with `CI_JOB_TOKEN`](../triggers/README.md#when-used-with-multi-project-pipelines). | +| `pipeline` | For multi-project pipelines created by [using the API with `CI_JOB_TOKEN`](../triggers/README.md#when-used-with-multi-project-pipelines). | | `chat` | For pipelines created by using a [GitLab ChatOps](../chatops/README.md) command. | | `webide` | For pipelines created by using the [WebIDE](../../user/project/web_ide/index.md). | | `merge_request_event` | For pipelines created when a merge request is created or updated. Required to enable [merge request pipelines](../merge_request_pipelines/index.md), [merged results pipelines](../merge_request_pipelines/pipelines_for_merged_results/index.md), and [merge trains](../merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md). | diff --git a/doc/development/telemetry/usage_ping.md b/doc/development/telemetry/usage_ping.md index 226b510a1e8..d23e66a40ad 100644 --- a/doc/development/telemetry/usage_ping.md +++ b/doc/development/telemetry/usage_ping.md @@ -822,9 +822,6 @@ The following is example content of the Usage Ping payload. "adapter": "postgresql", "version": "9.6.15" }, - "app_server": { - "type": "console" - }, "avg_cycle_analytics": { "issue": { "average": 999, |