Add latest changes from gitlab-org/gitlab@master

2 files changed, 30 insertions, 10 deletions

diff --git a/doc/development/application_limits.md b/doc/development/application_limits.md
index f89b238cd79..81ccebbd690 100644
--- a/doc/development/application_limits.md
+++ b/doc/development/application_limits.md
@@ -39,6 +39,12 @@ limit values. It's recommended to create separate migration script files.
    create_or_update_plan_limit('project_hooks', 'gold', 100)
    ```
 
+NOTE: **Note:** Some plans exist only on GitLab.com. You can check if the
+migration is running on GitLab.com with `Gitlab.com?`.
+
+NOTE: **Note:** The test environment doesn't have any plans. You can check if a
+migration is running in a test environment with `Rails.env.test?`
+
 ### Plan limits validation
 
 #### Get current limit
@@ -93,3 +99,20 @@ it_behaves_like 'includes Limitable concern' do
   subject { build(:project_hook, project: create(:project)) }
 end
 ```
+
+### Subscription Plans
+
+Self-hosted:
+
+- `default` - Everyone
+
+Hosted:
+
+- `free` - Everyone
+- `bronze`- Namespaces with a Bronze subscription
+- `silver` - Namespaces with a Silver subscription
+- `gold` - Namespaces with a Gold subscription
+
+NOTE: **Note:** Hosted plans exist only on GitLab.com.
+
+NOTE: **Note:** The test environment doesn't have any plans.
diff --git a/doc/development/dangerbot.md b/doc/development/dangerbot.md
index eec81098144..b6362f04311 100644
--- a/doc/development/dangerbot.md
+++ b/doc/development/dangerbot.md
@@ -15,22 +15,19 @@ to the existing rules, then this is the document for you.
 
 ## Danger comments in merge requests
 
-As of [2020-03-03](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26275),
-Danger is posting a new comment each time it runs in a pipeline and removes the
-previous comments it posted. Before that, Danger would only post one comment and
-update its content on subsequent `danger-review` runs.
+Danger only posts one comment and updates its content on subsequent
+`danger-review` runs. Given this, it's usually one of the first few comments
+in a merge request if not the first. If you didn't see it, try to look
+from the start of the merge request.
 
 ### Advantages
 
-- You get email notifications of Danger failures before the pipeline fails.
-- If someone introduces a change that creates a new Danger warning, it's very obvious now, both in email and in the UI.
-- If there are no new Danger warnings - just the roulette message - then the email acts as confirmation of that.
-- It's easier to see if a roulette recommendation changed, which is useful for people that think about roulette logic/behavior quite often.
-- You don't have to scroll up to get to the first Danger comment (sometimes MR can have more than discussions).
+- You don't get email notifications each time `danger-review` runs.
 
 ### Disadvantages
 
-- You get new email notifications for each `danger-review` run, which can clutter threaded discussions in email clients.
+- It's not obvious Danger will update the old comment, thus you need to
+  pay attention to it if it is updated or not.
 
 ## Run Danger locally