Add latest changes from gitlab-org/gitlab@master

5 files changed, 69 insertions, 10 deletions

diff --git a/doc/administration/instance_limits.md b/doc/administration/instance_limits.md
index 7beb1193459..c005af750ba 100644
--- a/doc/administration/instance_limits.md
+++ b/doc/administration/instance_limits.md
@@ -87,6 +87,28 @@ Plan.default.limits.update!(ci_active_jobs: 500)
 
 NOTE: **Note:** Set the limit to `0` to disable it.
 
+### Number of CI/CD subscriptions to a project
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/9045) in GitLab 12.9.
+
+The total number of subscriptions can be limited per project. This limit is
+checked each time a new subscription is created.
+
+If a new subscription would cause the total number of subscription to exceed the
+limit, the subscription will be considered invalid.
+
+- On GitLab.com different [limits are defined per plan](../user/gitlab_com/index.md#gitlab-cicd) and they affect all projects under that plan.
+- On [GitLab Starter](https://about.gitlab.com/pricing/#self-managed) tier or higher self-hosted installations, this limit is defined for the `default` plan that affects all projects.
+
+To set this limit on a self-hosted installation, run the following in the
+[GitLab Rails console](https://docs.gitlab.com/omnibus/maintenance/#starting-a-rails-console-session):
+
+```ruby
+Plan.default.limits.update!(ci_project_subscriptions: 500)
+```
+
+NOTE: **Note:** Set the limit to `0` to disable it.
+
 ## Environment data on Deploy Boards
 
 [Deploy Boards](../user/project/deploy_boards.md) load information from Kubernetes about
diff --git a/doc/ci/multi_project_pipelines.md b/doc/ci/multi_project_pipelines.md
index bf59d06f582..e41a6f0d9b1 100644
--- a/doc/ci/multi_project_pipelines.md
+++ b/doc/ci/multi_project_pipelines.md
@@ -227,3 +227,19 @@ Some features are not implemented yet. For example, support for environments.
 - `only` and `except`
 - `when` (only with `on_success`, `on_failure`, and `always` values)
 - `extends`
+
+## Trigger a pipeline when an upstream project is rebuilt
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/9045) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.8.
+
+You can trigger a pipeline in your project whenever a pipeline finishes for a new
+tag in a different project:
+
+1. Go to the project's **Settings > CI / CD** page, and expand the **Pipeline subscriptions** section.
+1. Enter the path to the project you want to subscribe to.
+1. Click subscribe.
+
+Any pipelines that complete successfully for new tags in the subscribed project
+will now trigger a pipeline on the current project's default branch. The maximum
+number of upstream pipeline subscriptions is 2, for both the upstream and
+downstream projects.
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
 
diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md
index d32b4847230..c69a4740ab3 100644
--- a/doc/user/project/settings/import_export.md
+++ b/doc/user/project/settings/import_export.md
@@ -77,6 +77,7 @@ The following items will be exported:
 - Design Management files and data **(PREMIUM)**
 - LFS objects
 - Issue boards
+- Pipelines history
 
 The following items will NOT be exported: