Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-05-25 03:09:46 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-05-25 03:09:46 +0300
commitb48f85e16dcdda9fa2f96b7d2fe16e0a6ba28403 (patch)
treed9384e2775056f42722cbe10648193d2a381217d /doc
parente09f6bdfd191f0cf8e54f0bc272e4e0635990ed9 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r--doc/api/environments.md2
-rw-r--r--doc/development/service_ping/implement.md3
-rw-r--r--doc/user/usage_quotas.md2
3 files changed, 4 insertions, 3 deletions
diff --git a/doc/api/environments.md b/doc/api/environments.md
index a806d8a50dd..d67808bfd61 100644
--- a/doc/api/environments.md
+++ b/doc/api/environments.md
@@ -386,7 +386,7 @@ POST /projects/:id/environments/:environment_id/stop
|------------------|----------------|----------|----------------------------------------------------------------------------------------------------------------|
| `id` | integer/string | yes | The ID or [URL-encoded path of the project](index.md#namespaced-path-encoding) owned by the authenticated user |
| `environment_id` | integer | yes | The ID of the environment |
-| `force` | boolean | no | Force environment to stop even when `on_stop` action fails |
+| `force` | boolean | no | Force environment to stop without executing `on_stop` actions |
```shell
curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/1/environments/1/stop"
diff --git a/doc/development/service_ping/implement.md b/doc/development/service_ping/implement.md
index 8021b24461c..ad7ea3b9e07 100644
--- a/doc/development/service_ping/implement.md
+++ b/doc/development/service_ping/implement.md
@@ -652,9 +652,10 @@ We return fallback values in these cases:
| Case | Value |
|-----------------------------|-------|
-| Deprecated Metric | -1000 |
+| Deprecated Metric ([Removed with version 14.3](https://gitlab.com/gitlab-org/gitlab/-/issues/335894)) | -1000 |
| Timeouts, general failures | -1 |
| Standard errors in counters | -2 |
+| Histogram metrics failure | { '-1' => -1 } |
## Test counters manually using your Rails console
diff --git a/doc/user/usage_quotas.md b/doc/user/usage_quotas.md
index fd658c96184..84c98a60917 100644
--- a/doc/user/usage_quotas.md
+++ b/doc/user/usage_quotas.md
@@ -32,7 +32,7 @@ You can view storage usage for your project or [namespace](../user/group/#namesp
The statistics are displayed. Select any title to view details. The information on this page
is updated every 90 minutes.
-If your namespace shows `N/A`, push a commit to any project in the
+If your namespace shows `'Not applicable.'`, push a commit to any project in the
namespace to recalculate the storage.
## Storage usage statistics