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
diff options
context:
space:
mode:
Diffstat (limited to 'doc/development')
-rw-r--r--doc/development/database_review.md2
-rw-r--r--doc/development/documentation/styleguide/word_list.md4
-rw-r--r--doc/development/event_store.md2
-rw-r--r--doc/development/feature_flags/controls.md2
-rw-r--r--doc/development/integrations/secure.md2
5 files changed, 8 insertions, 4 deletions
diff --git a/doc/development/database_review.md b/doc/development/database_review.md
index e3ebac8d821..082c843a12c 100644
--- a/doc/development/database_review.md
+++ b/doc/development/database_review.md
@@ -140,7 +140,7 @@ of error that would result in corruption or loss of production data.
Include in the MR description:
- If the migration itself is not reversible, details of how data changes could be reverted in the event of an incident. For example, in the case of a migration that deletes records (an operation that most of the times is not automatically revertable), how _could_ the deleted records be recovered.
-- If the migration deletes data apply the label `~data-deletion`
+- If the migration deletes data, apply the label `~data-deletion`.
- Concise descriptions of possible user experience impact of an error; for example, "Issues would unexpectedly go missing from Epics".
- Relevant data from the [query plans](#query-plans) that indicate the query works as expected; such as the approximate number of records that will be modified/deleted.
diff --git a/doc/development/documentation/styleguide/word_list.md b/doc/development/documentation/styleguide/word_list.md
index b6264addbdd..6d069dad8af 100644
--- a/doc/development/documentation/styleguide/word_list.md
+++ b/doc/development/documentation/styleguide/word_list.md
@@ -647,6 +647,10 @@ Use **press** when talking about keyboard keys. For example:
Do not use profanity. Doing so may negatively affect other users and contributors, which is contrary to the GitLab value of [Diversity, Inclusion, and Belonging](https://about.gitlab.com/handbook/values/#diversity-inclusion).
+## push rules
+
+Use lowercase for **push rules**.
+
## Reporter
When writing about the Reporter role:
diff --git a/doc/development/event_store.md b/doc/development/event_store.md
index 85dfdf8b8ef..7f2b9c86d27 100644
--- a/doc/development/event_store.md
+++ b/doc/development/event_store.md
@@ -285,7 +285,7 @@ This technique can avoid scheduling Sidekiq jobs if the subscriber is interested
small subset of events.
WARNING:
-When using conditional dispatch it must contain only cheap conditions because they are
+When using conditional dispatch it must contain only cheap conditions because they are
executed synchronously every time the given event is published.
For complex conditions it's best to subscribe to all the events and then handle the logic
diff --git a/doc/development/feature_flags/controls.md b/doc/development/feature_flags/controls.md
index 91e27a3838c..6bf5be23ace 100644
--- a/doc/development/feature_flags/controls.md
+++ b/doc/development/feature_flags/controls.md
@@ -69,7 +69,7 @@ Slack channel for the stage the feature is relevant to. For example, use the
`#s_monitor` channel for features developed by the Monitor stage, Health
group.
-To enable a feature for 25% of all users, run the following in Slack:
+To enable a feature for 25% of the time, run the following in Slack:
```shell
/chatops run feature set new_navigation_bar 25 --dev
diff --git a/doc/development/integrations/secure.md b/doc/development/integrations/secure.md
index b362beab100..147d379cec7 100644
--- a/doc/development/integrations/secure.md
+++ b/doc/development/integrations/secure.md
@@ -331,7 +331,7 @@ You can find the schemas for these scanners here:
In GitLab 14.10 and later, report validation against the schemas is enabled. To enable report validation for versions earlier than 14.10,
set [`VALIDATE_SCHEMA`](../../user/application_security/#enable-security-report-validation) to
-`"true"`.
+`"true"`.
Reports that don't pass validation are not ingested by GitLab, and an error message
displays on the corresponding pipeline.