Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

1 files changed, 12 insertions, 12 deletions

diff --git a/doc/development/feature_flags/controls.md b/doc/development/feature_flags/controls.md
index c69a698149e..35dbc2703f9 100644
--- a/doc/development/feature_flags/controls.md
+++ b/doc/development/feature_flags/controls.md
@@ -96,18 +96,18 @@ Guidelines:
 
 #### Process
 
-Before toggling any feature flag, check that there are no ongoing
-significant incidents on GitLab.com. You can do this by checking the
-`#production` and `#incident-management` Slack channels, or looking for
-[open incident issues](https://gitlab.com/gitlab-com/gl-infra/production/-/issues/?scope=all&state=opened&label_name[]=incident)
-(although check the dates and times).
-
-We do not want to introduce changes during an incident, as it can make
-diagnosis and resolution of the incident much harder to achieve, and
-also will largely invalidate your rollout process as you will be unable
-to assess whether the rollout was without problems or not.
-
-If there is any doubt, ask in `#production`.
+When enabling a feature flag rollout, the system will automatically block the
+chatops command from succeeding if there are active `"severity::1"` or `~"severity::2"`
+incidents or in-progress change issues, for example:
+
+```shell
+/chatops run feature set gitaly_lfs_pointers_pipeline true
+
+- Production checks fail!
+- active incidents
+
+  2021-06-29 Canary deployment failing QA tests
+```
 
 The following `/chatops` commands should be performed in the Slack
 `#production` channel.