Add latest changes from gitlab-org/gitlab@master

2 files changed, 11 insertions, 5 deletions

diff --git a/doc/development/dangerbot.md b/doc/development/dangerbot.md
index dbd53c8ed21..dcbb15e5811 100644
--- a/doc/development/dangerbot.md
+++ b/doc/development/dangerbot.md
@@ -34,6 +34,8 @@ from the start of the merge request.
 
 - It's not obvious Danger updates the old comment, thus you need to
   pay attention to it if it is updated or not.
+- When Danger tokens are rotated, it creates confusion/clutter (as old comments
+  can't be updated).
 
 ## Run Danger locally
 
@@ -179,11 +181,15 @@ at GitLab so far:
 
 ## Limitations
 
-Danger is run but its output is not added to a merge request comment if working
-on a fork. This happens because the secret variable from the canonical project
-is not shared to forks.
+If working on a personal fork, Danger is run but it's output is not added to a
+merge request comment and labels are not applied.
+This happens because the secret variable from the canonical project is not shared
+to forks.
 
-### Configuring Danger for forks
+The best and recommended approach is to work from the [community forks](https://gitlab.com/gitlab-community/meta),
+where Danger is already configured.
+
+### Configuring Danger for personal forks
 
 Contributors can configure Danger for their forks with the following steps:
 
diff --git a/doc/development/database_review.md b/doc/development/database_review.md
index 398ee5d8772..ec4c4f9f2c5 100644
--- a/doc/development/database_review.md
+++ b/doc/development/database_review.md
@@ -182,7 +182,7 @@ Include in the MR description:
   - To produce a query plan with enough data, you can use the IDs of:
     - The `gitlab-org` namespace (`namespace_id = 9970`), for queries involving a group.
     - The `gitlab-org/gitlab-foss` (`project_id = 13083`) or the `gitlab-org/gitlab` (`project_id = 278964`) projects, for queries involving a project.
-      - For queries involving memebrship of projects, `project_namespace_id` of these projects may be required to create a query plan. These are `15846663` (for `gitlab-org/gitlab`) and `15846626` (for `gitlab-org/gitlab-foss`)
+      - For queries involving membership of projects, `project_namespace_id` of these projects may be required to create a query plan. These are `15846663` (for `gitlab-org/gitlab`) and `15846626` (for `gitlab-org/gitlab-foss`)
     - The `gitlab-qa` user (`user_id = 1614863`), for queries involving a user.
       - Optionally, you can also use your own `user_id`, or the `user_id` of a user with a long history within the project or group being used to generate the query plan.
   - That means that no query plan should return 0 records or less records than the provided limit (if a limit is included). If a query is used in batching, a proper example batch with adequate included results should be identified and provided.