Add latest changes from gitlab-org/gitlab@master

3 files changed, 39 insertions, 9 deletions

diff --git a/doc/ci/runners/README.md b/doc/ci/runners/README.md
index a3cc46f59bf..eb4bedd2d3a 100644
--- a/doc/ci/runners/README.md
+++ b/doc/ci/runners/README.md
@@ -16,6 +16,10 @@ the coordinator API of GitLab CI/CD, runs the job, and sends the result back to
 Runners are created by an administrator and are visible in the GitLab UI.
 Runners can be specific to certain projects or available to all projects.
 
+This documentation is focused on using runners in GitLab.
+If you need to install and configure GitLab Runner, see
+[the GitLab Runner documentation](https://docs.gitlab.com/runner/).
+
 ## Types of runners
 
 In the GitLab UI there are three types of runners, based on who you want to have access:
diff --git a/doc/development/database/setting_multiple_values.md b/doc/development/database/setting_multiple_values.md
index 5569a0e10b7..fda502eefbc 100644
--- a/doc/development/database/setting_multiple_values.md
+++ b/doc/development/database/setting_multiple_values.md
@@ -2,8 +2,8 @@
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/32921) in GitLab 13.5.
 
-Frequently, we will want to update multiple objects with new values for one
-or more columns. The obvious way to do this is using `Relation#update_all`:
+There's often a need to update multiple objects with new values for one
+or more columns. One method of doing this is using `Relation#update_all`:
 
 ```ruby
 user.issues.open.update_all(due_date: 7.days.from_now) # (1)
@@ -28,11 +28,11 @@ update issues
   where id = obj_id
 ```
 
-The bad news: There is no way to express this in ActiveRecord or even dropping
-down to ARel - the `UpdateManager` just does not support `update from`, so this
+The bad news: there is no way to express this in ActiveRecord or even dropping
+down to ARel. The `UpdateManager` does not support `update from`, so this
 is not expressible.
 
-The good news: We supply an abstraction to help you generate these kinds of
+The good news: we supply an abstraction to help you generate these kinds of
 updates, called `Gitlab::Database::BulkUpdate`. This constructs queries such as the
 above, and uses binding parameters to avoid SQL injection.
 
@@ -44,7 +44,7 @@ To use this, we need:
 - a mapping from object/ID to the new values to set for that object
 - a way to determine the table for each object
 
-So for example, we can express the query above as:
+For example, we can express the query above as:
 
 ```ruby
 issue_a = Issue.find(..)
@@ -87,7 +87,7 @@ objects = Foo.from_union([
     ])
 # At this point, all the objects are instances of Foo, even the ones from the
 # Bar table
-mapping = objects.to_h { |obj| [obj, bazzes[obj.id] }
+mapping = objects.to_h { |obj| [obj, bazzes[obj.id]] }
 
 # Issues at most 2 queries
 ::Gitlab::Database::BulkUpdate.execute(%i[baz], mapping) do |obj|
@@ -100,4 +100,4 @@ end
 Note that this is a **very low level** tool, and operates on the raw column
 values. Enumerations and state fields must be translated into their underlying
 representations, for example, and nested associations are not supported. No
-validations or hooks will be called.
+validations or hooks are called.
diff --git a/doc/user/project/milestones/burndown_and_burnup_charts.md b/doc/user/project/milestones/burndown_and_burnup_charts.md
index 327a52a05ab..0390ab83c23 100644
--- a/doc/user/project/milestones/burndown_and_burnup_charts.md
+++ b/doc/user/project/milestones/burndown_and_burnup_charts.md
@@ -103,7 +103,14 @@ Reopened issues are considered as having been opened on the day after they were
 
 ## Burnup charts
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/6903) in [GitLab Starter](https://about.gitlab.com/pricing/) 13.5.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/6903) in [GitLab Starter](https://about.gitlab.com/pricing/) 13.5.
+> - It's [deployed behind a feature flag](../../feature_flags.md), enabled by default.
+> - It's enabled on GitLab.com.
+> - It's recommended for production use.
+> - For GitLab self-managed instances, GitLab administrators can opt to [disable it](#enable-or-disable-burnup-charts). **(STARTER ONLY)**
+
+CAUTION: **Warning:**
+This feature might not be available to you. Check the **version history** note above for details.
 
 Burnup charts show the assigned and completed work for a milestone.
 
@@ -129,6 +136,25 @@ Burnup charts can show either the total number of issues or total weight for eac
 day of the milestone. Use the toggle above the charts to switch between total
 and weight.
 
+### Enable or disable burnup charts **(STARTER ONLY)**
+
+Burnup charts is under development but ready for production use.
+It is deployed behind a feature flag that is **enabled by default**.
+[GitLab administrators with access to the GitLab Rails console](../../../administration/feature_flags.md)
+can opt to disable it.
+
+To enable it:
+
+```ruby
+Feature.enable(:burnup_charts)
+```
+
+To disable it:
+
+```ruby
+Feature.disable(:burnup_charts)
+```
+
 <!-- ## Troubleshooting
 
 Include any troubleshooting steps that you can foresee. If you know beforehand what issues