diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-04 06:09:50 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-04 06:09:50 +0300 |
| commit | 21be9646a94e2c145897e25d9c521523d55e1614 (patch) | |
| tree | 2873c5461d2222f9e51ba9cea9d2ed87d3f87e20 /doc | |
| parent | 933d8b6d85b56a2f0f9d8ffe54f0212422537b03 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/pipelines.md | 2 | ||||
| -rw-r--r-- | doc/user/admin_area/settings/usage_statistics.md | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/api/pipelines.md b/doc/api/pipelines.md index 5b67df14ace..a4245ec02aa 100644 --- a/doc/api/pipelines.md +++ b/doc/api/pipelines.md @@ -225,7 +225,7 @@ Response: } ``` -## Cancel a pipelines jobs +## Cancel a pipeline's jobs > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5837) in GitLab 8.11 diff --git a/doc/user/admin_area/settings/usage_statistics.md b/doc/user/admin_area/settings/usage_statistics.md index 1f01a364514..f9a45fadf6d 100644 --- a/doc/user/admin_area/settings/usage_statistics.md +++ b/doc/user/admin_area/settings/usage_statistics.md @@ -304,8 +304,10 @@ but commented out to help encourage others to add to it in the future. --> |licenses_list_views|counts|| |user_preferences_group_overview_details|counts|| |user_preferences_group_overview_security_dashboard|counts|| +|ingress_modsecurity_logging|counts|| |ingress_modsecurity_blocking|counts|| |ingress_modsecurity_disabled|counts|| +|ingress_modsecurity_not_installed|counts|| |dependency_list_usages_total|counts|| |epics|counts|| |feature_flags|counts|| |