Add latest changes from gitlab-org/gitlab@12-10-stable-ee

35 files changed, 350 insertions, 49 deletions

diff --git a/doc/user/project/deploy_tokens/img/deploy_tokens.png b/doc/user/project/deploy_tokens/img/deploy_tokens.png
index afe1dfb922f..1981b0747bf 100644
--- a/doc/user/project/deploy_tokens/img/deploy_tokens.png
+++ b/doc/user/project/deploy_tokens/img/deploy_tokens.png
diff --git a/doc/user/project/img/issue_boards_blocked_icon_v12_8.png b/doc/user/project/img/issue_boards_blocked_icon_v12_8.png
index 779f643ba56..1055fb48322 100644
--- a/doc/user/project/img/issue_boards_blocked_icon_v12_8.png
+++ b/doc/user/project/img/issue_boards_blocked_icon_v12_8.png
diff --git a/doc/user/project/img/status_page_incidents_v12_10.png b/doc/user/project/img/status_page_incidents_v12_10.png
index ccc1eef3ea3..3540fbffcf8 100644
--- a/doc/user/project/img/status_page_incidents_v12_10.png
+++ b/doc/user/project/img/status_page_incidents_v12_10.png
diff --git a/doc/user/project/import/img/jira/import_issues_from_jira_button_v12_10.png b/doc/user/project/import/img/jira/import_issues_from_jira_button_v12_10.png
index 8983d685a24..4ab42485d0b 100644
--- a/doc/user/project/import/img/jira/import_issues_from_jira_button_v12_10.png
+++ b/doc/user/project/import/img/jira/import_issues_from_jira_button_v12_10.png
diff --git a/doc/user/project/import/img/jira/import_issues_from_jira_form_v12_10.png b/doc/user/project/import/img/jira/import_issues_from_jira_form_v12_10.png
index 0ac5e9bdb91..6278cb5f970 100644
--- a/doc/user/project/import/img/jira/import_issues_from_jira_form_v12_10.png
+++ b/doc/user/project/import/img/jira/import_issues_from_jira_form_v12_10.png
diff --git a/doc/user/project/import/img/jira/import_issues_from_jira_projects_v12_10.png b/doc/user/project/import/img/jira/import_issues_from_jira_projects_v12_10.png
index cf5f0dd59cd..bf9728e0311 100644
--- a/doc/user/project/import/img/jira/import_issues_from_jira_projects_v12_10.png
+++ b/doc/user/project/import/img/jira/import_issues_from_jira_projects_v12_10.png
diff --git a/doc/user/project/index.md b/doc/user/project/index.md
index 99050f823c5..585c45e35df 100644
--- a/doc/user/project/index.md
+++ b/doc/user/project/index.md
@@ -102,6 +102,8 @@ When you create a project in GitLab, you'll have access to a large number of
 - [Code owners](code_owners.md): specify code owners for certain files **(STARTER)**
 - [License Compliance](../compliance/license_compliance/index.md): approve and blacklist licenses for projects. **(ULTIMATE)**
 - [Dependency List](../application_security/dependency_list/index.md): view project dependencies. **(ULTIMATE)**
+- [Requirements](requirements/index.md): Requirements allow you to create criteria to check your products against. **(ULTIMATE)**
+- [Static Site Editor](static_site_editor/index.md): quickly edit content on static websites without prior knowledge of the codebase or Git commands.
 
 ### Project integrations
 
@@ -170,6 +172,13 @@ Read through the documentation on [CI/CD for external repositories](../../ci/ci_
 
 Learn how to [add members to your projects](members/index.md).
 
+## Project activity
+
+To view the activity of a project, navigate to **Project overview > Activity**.
+From there, you can click on the tabs to see **All** the activity, or see it
+filtered by **Push events**, **Merge events**, **Issue events**, **Comments**,
+**Team**, and **Wiki**.
+
 ### Leave a project
 
 **Leave project** will only display on the project's dashboard
diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md
index 88a9bd40f07..bbed14ea93f 100644
--- a/doc/user/project/integrations/prometheus.md
+++ b/doc/user/project/integrations/prometheus.md
@@ -289,6 +289,7 @@ The following tables outline the details of expected properties.
 | `title` | string | yes | Heading for the panel. |
 | `y_label` | string | no, but highly encouraged | Y-Axis label for the panel. |
 | `y_axis` | string | no | Y-Axis configuration for the panel. |
+| `max_value` | number | no | Denominator value used for calculating [percentile based results](#percentile-based-results) |
 | `weight` | number | no, defaults to order in file | Order to appear within the grouping. Lower number means higher priority, which will be higher on the page. Numbers do not need to be consecutive. |
 | `metrics` | array | yes | The metrics which should be displayed in the panel. Any number of metrics can be displayed when `type` is `area-chart` or `line-chart`, whereas only 3 can be displayed when `type` is `anomaly-chart`. |
 
@@ -304,7 +305,7 @@ The following tables outline the details of expected properties.
 
 | Property | Type | Required | Description |
 | ------ | ------ | ------ | ------ |
-| `id` | string | no | Used for associating dashboard metrics with database records. Must be unique across dashboard configuration files. Required for [alerting](#setting-up-alerts-for-prometheus-metrics-ultimate) (support not yet enabled, see [relevant issue](https://gitlab.com/gitlab-org/gitlab-foss/issues/60319)). |
+| `id` | string | no | Used for associating dashboard metrics with database records. Must be unique across dashboard configuration files. Required for [alerting](#setting-up-alerts-for-prometheus-metrics) (support not yet enabled, see [relevant issue](https://gitlab.com/gitlab-org/gitlab-foss/issues/60319)). |
 | `unit` | string | yes | Defines the unit of the query's return data. |
 | `label` | string | no, but highly encouraged | Defines the legend-label for the query. Should be unique within the panel's metrics. Can contain time series labels as interpolated variables. |
 | `query` | string | yes if `query_range` is not defined | Defines the Prometheus query to be used to populate the chart/panel. If defined, the `query` endpoint of the [Prometheus API](https://prometheus.io/docs/prometheus/latest/querying/api/) will be utilized. |
@@ -627,7 +628,21 @@ The options are:
 - [View logs](#view-logs-ultimate)
 - [Download CSV](#downloading-data-as-csv)
 - [Copy link to chart](#embedding-gitlab-managed-kubernetes-metrics)
-- [Alerts](#setting-up-alerts-for-prometheus-metrics-ultimate)
+- [Alerts](#setting-up-alerts-for-prometheus-metrics)
+
+### Dashboard Annotations
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/211330) in GitLab 12.10 (enabled by feature flag `metrics_dashboard_annotations`).
+
+You can use **Metrics Dashboard Annotations** to mark any important events on
+every metrics dashboard by adding annotations to it. While viewing a dashboard,
+annotation entries assigned to the selected time range will be automatically
+fetched and displayed on every chart within that dashboard. On mouse hover, each
+annotation presents additional details, including the exact time of an event and
+its description.
+
+You can create annotations by making requests to the
+[Metrics dashboard annotations API](../../../api/metrics_dashboard_annotations.md)
 
 ### View Logs **(ULTIMATE)**
 
@@ -652,7 +667,7 @@ and end times to the URL, enabling you to share specific timeframes more easily.
 
 Data from Prometheus charts on the metrics dashboard can be downloaded as CSV.
 
-### Setting up alerts for Prometheus metrics **(ULTIMATE)**
+### Setting up alerts for Prometheus metrics
 
 #### Managed Prometheus instances
 
@@ -805,7 +820,7 @@ It is also possible to embed either the default dashboard metrics or individual
 
 ### Embedding metrics based on alerts in incident issues
 
-For [GitLab-managed alerting rules](#setting-up-alerts-for-prometheus-metrics-ultimate), the issue will include an embedded chart for the query corresponding to the alert. The chart displays an hour of data surrounding the starting point of the incident, 30 minutes before and after.
+For [GitLab-managed alerting rules](#setting-up-alerts-for-prometheus-metrics), the issue will include an embedded chart for the query corresponding to the alert. The chart displays an hour of data surrounding the starting point of the incident, 30 minutes before and after.
 
 For [manually configured Prometheus instances](#manual-configuration-of-prometheus), a chart corresponding to the query can be included if these requirements are met:
 
diff --git a/doc/user/project/issues/csv_export.md b/doc/user/project/issues/csv_export.md
index 53af878cbd6..ec53b3dbbba 100644
--- a/doc/user/project/issues/csv_export.md
+++ b/doc/user/project/issues/csv_export.md
@@ -1,6 +1,7 @@
 # Export Issues to CSV
 
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1126) in [GitLab Starter 9.0](https://about.gitlab.com/releases/2017/03/22/gitlab-9-0-released/#export-issues-ees-eep).
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/1126) in [GitLab Starter 9.0](https://about.gitlab.com/releases/2017/03/22/gitlab-9-0-released/#export-issues-ees-eep).
+> - Moved to GitLab Core in GitLab 12.10.
 
 Issues can be exported as CSV from GitLab and are sent to your default notification email as an attachment.
 
diff --git a/doc/user/project/issues/design_management.md b/doc/user/project/issues/design_management.md
index ff481109e58..1078d0410ed 100644
--- a/doc/user/project/issues/design_management.md
+++ b/doc/user/project/issues/design_management.md
@@ -1,4 +1,4 @@
-# Design Management
+# Design Management **(PREMIUM)**
 
 > [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/660) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.2.
 
diff --git a/doc/user/project/issues/img/epic_tree_health_status_v12_10.png b/doc/user/project/issues/img/epic_tree_health_status_v12_10.png
new file mode 100644
index 00000000000..c6d0117b1c4
--- /dev/null
+++ b/doc/user/project/issues/img/epic_tree_health_status_v12_10.png
diff --git a/doc/user/project/issues/img/issue_activity_sort_order_v12_10.png b/doc/user/project/issues/img/issue_activity_sort_order_v12_10.png
new file mode 100644
index 00000000000..3e19ee1ac66
--- /dev/null
+++ b/doc/user/project/issues/img/issue_activity_sort_order_v12_10.png
diff --git a/doc/user/project/issues/img/issue_health_status_dropdown_v12_10.png b/doc/user/project/issues/img/issue_health_status_dropdown_v12_10.png
index c0f0a0dfe16..f8517de4e12 100644
--- a/doc/user/project/issues/img/issue_health_status_dropdown_v12_10.png
+++ b/doc/user/project/issues/img/issue_health_status_dropdown_v12_10.png
diff --git a/doc/user/project/issues/issue_data_and_actions.md b/doc/user/project/issues/issue_data_and_actions.md
index d6576fc780d..06524f785ab 100644
--- a/doc/user/project/issues/issue_data_and_actions.md
+++ b/doc/user/project/issues/issue_data_and_actions.md
@@ -8,11 +8,38 @@ The image below illustrates what an issue may look like. Note that certain parts
 look slightly different or will be absent, depending on the version of GitLab being used
 and the permissions of the user viewing the issue.
 
-![Issue view](img/issues_main_view_numbered.png)
-
 You can find all the information for that issue on one screen.
 
-### Issue screen
+![Issue view](img/issues_main_view_numbered.png)
+
+- **1.** [New Issue, close issue (reopen issue, report issue)](#new-issue-close-issue-reopen-issue-report-issue)
+- **2.** [To Do](#to-do)
+- **3.** [Assignee](#assignee)
+  - **3.1.** [Multiple Assignees **(STARTER)**](#multiple-assignees-starter)
+- **4.** [Epic **(ULTIMATE)**](#epic-ultimate)
+- **5.** [Milestone](#milestone)
+- **6.** [Time tracking](#time-tracking)
+- **7.** [Due date](#due-date)
+- **8.** [Labels](#labels)
+- **9.** [Weight **(STARTER)**](#weight-starter)
+- **10.** [Confidentiality](#confidentiality)
+- **11.** [Lock issue](#lock-issue)
+- **12.** [Participants](#participants)
+- **13.** [Notifications](#notifications)
+- **14.** [Reference](#reference)
+- **15.** [Edit](#edit)
+- **16.** [Description](#description)
+- **17.** [Mentions](#mentions)
+- **18.** [Related Issues **(STARTER)**](#related-issues-starter)
+- **19.** [Related Merge Requests](#related-merge-requests)
+- **20.** [Award emoji](#award-emoji)
+- **21.** [Show all activity](#show-all-activity)
+- **22.** [Create Merge Request](#create-merge-request)
+- **23.** [Issue history](#issue-history)
+  - [Activity sort order](#activity-sort-order)
+- **24.** [Comments](#comments)
+- **25.** [Submit comment, start a thread, or comment and close](#submit-comment-start-a-thread-or-comment-and-close)
+- **26.** [Zoom meetings](#zoom-meetings)
 
 An issue starts with its status (open or closed), followed by its author,
 and includes many other functionalities, numbered in the image above to
@@ -22,7 +49,7 @@ Many of the elements of the issue screen refresh automatically, such as the titl
 description, when they are changed by another user. Comments and system notes also
 update automatically in response to various actions and content updates.
 
-#### 1. New Issue, close issue (reopen issue, report issue)
+### New Issue, close issue (reopen issue, report issue)
 
 Clicking on **New issue** will open a new window to create a new issue in the same project.
 Clicking on **Close issue** will close this issue, but it will not be deleted. If the
@@ -39,22 +66,23 @@ after it is closed.
 
 ![Report Abuse](img/report-abuse.png)
 
-#### 2. To Do
+### To Do
 
 You can add issues to and remove issues from your [GitLab To-Do List](../../todos.md).
 
-The button to do this has a different label depending on whether the issue is already on your To-Do List or not. If the issue is:
+The button to do this has a different label depending on whether the issue is already on your To-Do
+List or not. If the issue is:
 
 - Already on your To-Do List: The button is labeled **Mark as done**. Click the button to remove the issue from your To-Do List.
-- Not on your To-Do List: The button is labelled **Add a To Do**. Click the button to add the issue to your To-Do List.
+- Not on your To-Do List: The button is labeled **Add a To Do**. Click the button to add the issue to your To-Do List.
 
-#### 3. Assignee
+### Assignee
 
 An issue can be assigned to:
 
 - Yourself.
 - Another person.
-- [Many people](#31-multiple-assignees-STARTER). **(STARTER)**
+- [Many people](#multiple-assignees-STARTER). **(STARTER)**
 
 The assignee(s) can be changed as often as needed. The idea is that the assignees are
 responsible for that issue until it's reassigned to someone else to take it from there.
@@ -64,7 +92,7 @@ TIP: **Tip:**
 If a user is not member of that project, it can only be
 assigned to them if they created the issue themselves.
 
-##### 3.1. Multiple Assignees **(STARTER)**
+#### Multiple Assignees **(STARTER)**
 
 Often multiple people work on the same issue together, which can be especially difficult
 to track in large teams where there is shared ownership of an issue.
@@ -72,29 +100,29 @@ to track in large teams where there is shared ownership of an issue.
 In [GitLab Starter](https://about.gitlab.com/pricing/), you can
 [assign multiple people](multiple_assignees_for_issues.md) to an issue.
 
-#### 4. Epic **(ULTIMATE)**
+### Epic **(ULTIMATE)**
 
 You can assign issues to an [Epic](../../group/epics/index.md), which allows better
 management of groups of related issues.
 
-#### 5. Milestone
+### Milestone
 
 Select a [milestone](../milestones/index.md) to attribute that issue to.
 
-#### 6. Time Tracking
+### Time tracking
 
 Use [GitLab Quick Actions](../quick_actions.md) to [track estimates and time spent on issues](../time_tracking.md).
 You can add an [estimate of the time it will take](../time_tracking.md#estimates)
 to resolve the issue, and also add [the time spent](../time_tracking.md#time-spent)
 on the resolution of the issue.
 
-#### 7. Due date
+### Due date
 
 When you work on a tight schedule, it's important to have a way to set a deadline for
 implementations and for solving problems. This can be done in the [due date](due_dates.md)
 element. Due dates can be changed as many times as needed.
 
-#### 8. Labels
+### Labels
 
 Categorize issues by giving them [labels](../labels.md). They help to organize workflows,
 and they enable you to work with the [GitLab Issue Board](index.md#issue-boards).
@@ -107,29 +135,29 @@ TIP: **Tip:**
 If a label doesn't exist yet, you can click **Edit**, and it opens a dropdown menu
 from which you can select **Create new label**.
 
-#### 9. Weight **(STARTER)**
+### Weight **(STARTER)**
 
 [Assign a weight](issue_weight.md) to an issue.
 Larger values are used to indicate more effort is required to complete the issue. Only
 positive values or zero are allowed.
 
-#### 10. Confidentiality
+### Confidentiality
 
 You can [set an issue to be confidential](confidential_issues.md). When set, unauthorized
 users will not be able to access the issue, and will not see it listed in project
 issue boards or the issue list.
 
-#### 11. Lock issue
+### Lock issue
 
 You can [lock the threads](../../discussions/index.md#lock-discussions) in the issue,
 to prevent further comments from being added.
 
-#### 12. Participants
+### Participants
 
 All the users involved in that issue. Either they participated in the [thread](../../discussions/index.md),
 or were mentioned in the description or threads.
 
-#### 13. Notifications
+### Notifications
 
 Click on the icon to enable/disable [notifications](../../profile/notifications.md#issue--epics--merge-request-events)
 for the issue. This will automatically enable if you participate in the issue in any way.
@@ -139,27 +167,27 @@ for the issue. This will automatically enable if you participate in the issue in
 - **Disable**: If you are receiving notifications for updates to that issue but no
   longer want to receive them, unsubscribe from it.
 
-#### 14. Reference
+### Reference
 
 - A quick "copy" button for that issue's reference, which looks like
   `foo/bar#xxx`, where `foo` is the `username` or `groupname`, `bar` is the
   `project-name`, and `xxx` is the issue number.
 
-#### 15. Edit
+### Edit
 
 Clicking this icon opens the issue for editing, and you will have access to all the
 same fields as when the issue was created. This icon will not display if the user
 does not have permission to edit the issue.
 
-#### 16. Description
+### Description
 
 The plain text title and description of the issue fill the top center of the issue page.
 The description fully supports [GitLab Flavored Markdown](../../markdown.md#gitlab-flavored-markdown-gfm),
 allowing many formatting options.
 
-> [Since GitLab 12.6](https://gitlab.com/gitlab-org/gitlab/issues/10103), changes to an issue's description are listed in the [issue history](#23-issue-history).**(STARTER)**
+> [Since GitLab 12.6](https://gitlab.com/gitlab-org/gitlab/issues/10103), changes to an issue's description are listed in the [issue history](#issue-history).**(STARTER)**
 
-#### 17. Mentions
+### Mentions
 
 You can mention a user or a group present in your GitLab instance with `@username` or
 `@groupname` and they will be notified via todos and email, unless they have disabled
@@ -174,19 +202,19 @@ TIP: **Tip:**
 Avoid mentioning `@all` in issues and merge requests, as it sends an email notification
 to all the members of that project's group, which can be interpreted as spam.
 
-#### 18. Related Issues **(STARTER)**
+### Related Issues **(STARTER)**
 
 Issues that were mentioned as [related issues](related_issues.md) are listed here.
 You can also click the `+` to add more related issues.
 
-#### 19. Related Merge Requests
+### Related Merge Requests
 
 Merge requests that were mentioned in that issue's description or in the issue thread
 are listed as [related merge requests](crosslinking_issues.md#from-merge-requests) here.
 Also, if the current issue was mentioned as related in another merge request, that
 merge request will be listed here.
 
-#### 20. Award emoji
+### Award emoji
 
 You can award an emoji to that issue. There are shortcuts to "thumbs_up" and "thumbs_down",
 or you can click on the light gray "face" to choose a different reaction from the
@@ -197,7 +225,7 @@ Posting "+1" as a comment in a thread spams all subscribed participants of that
 clutters the threads, and is not recommended. Awarding an emoji is a way
 to let them know your reaction without spamming them.
 
-#### 21. Show all activity
+### Show all activity
 
 You can filter what is displayed in the issue history by clicking on **Show all activity**
 and selecting either:
@@ -209,7 +237,7 @@ Also:
 
 - You can mention a user or a group present in your GitLab instance with
   `@username` or `@groupname` and they will be notified via To-Do items
-  and email, unless they have [disabled all notifications](#13-notifications)
+  and email, unless they have [disabled all notifications](#notifications)
   in their profile settings.
 - Mentions for yourself (the current logged in user), will be highlighted
   in a different color, allowing you to easily see which comments involve you,
@@ -217,7 +245,7 @@ Also:
 
 ![Show all activity](img/show-all-activity.png)
 
-#### 22. Create Merge Request
+### Create Merge Request
 
 Create a new branch and [WIP merge request](../merge_requests/work_in_progress_merge_requests.md)
 in one action. The branch will be named `issuenumber-title` by default, but you can
@@ -230,17 +258,30 @@ close the issue when it is merged.
 Optionally, you can choose to create a [new branch](../repository/web_editor.md#create-a-new-branch-from-an-issue)
 only, named after that issue.
 
-#### 23. Issue history
+### Issue history
 
 All comments and updates to the issue are tracked and listed here, but this can be
 filtered, as shown above.
 
-#### 24. Comments
+#### Activity sort order
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/14588) in GitLab 12.10.
+
+You can reverse the default order and interact with the activity feed sorted by most recent items
+at the top. Your preference is saved via local storage and automatically applied to every issue
+you view.
+
+To change the activity sort order, click the **Oldest first** dropdown menu and select either oldest
+or newest items to be shown first.
+
+![Issue activity sort order dropdown button](img/issue_activity_sort_order_v12_10.png)
+
+### Comments
 
 Collaborate in the issue by posting comments in its thread. This text field also fully
 supports [GitLab Flavored Markdown](../../markdown.md#gitlab-flavored-markdown-gfm).
 
-#### 25. Submit Comment, start a thread, or comment and close
+### Submit comment, start a thread, or comment and close
 
 Once you write a comment, you can:
 
@@ -253,7 +294,7 @@ Once you write a comment, you can:
 
 You can also close the issue from here, so you don't need to scroll to the top of the issue page.
 
-#### 26. Zoom Meetings
+### Zoom meetings
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/31103) in GitLab 12.3.
 
diff --git a/doc/user/project/issues/managing_issues.md b/doc/user/project/issues/managing_issues.md
index b51263b7528..4ee29f3357d 100644
--- a/doc/user/project/issues/managing_issues.md
+++ b/doc/user/project/issues/managing_issues.md
@@ -7,7 +7,7 @@ you can do with issues.
 
 ## Create a new Issue
 
-When you create a new issue, you'll be prompted to fill in the [data and fields of the issue](issue_data_and_actions.md#parts-of-an-issue), as illustrated below. If you know
+When you create a new issue, you'll be prompted to fill in the [data and fields of the issue](issue_data_and_actions.md), as illustrated below. If you know
 the values you want to assign to an issue, you can use the [Quick actions](../quick_actions.md)
 feature to input values, instead of selecting them from lists.
 
diff --git a/doc/user/project/issues/multiple_assignees_for_issues.md b/doc/user/project/issues/multiple_assignees_for_issues.md
index fefc690e073..dff6a6031d7 100644
--- a/doc/user/project/issues/multiple_assignees_for_issues.md
+++ b/doc/user/project/issues/multiple_assignees_for_issues.md
@@ -1,8 +1,6 @@
 # Multiple Assignees for Issues **(STARTER)**
 
-> **Note:**
-[Introduced](https://gitlab.com/gitlab-org/gitlab/issues/1904)
-in [GitLab Starter 9.2](https://about.gitlab.com/releases/2017/05/22/gitlab-9-2-released/#multiple-assignees-for-issues).
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/1904) in [GitLab Starter 9.2](https://about.gitlab.com/releases/2017/05/22/gitlab-9-2-released/#multiple-assignees-for-issues).
 
 ## Overview
 
diff --git a/doc/user/project/merge_requests/img/versions_compare_head_v12_10.png b/doc/user/project/merge_requests/img/versions_compare_head_v12_10.png
new file mode 100644
index 00000000000..353cf458243
--- /dev/null
+++ b/doc/user/project/merge_requests/img/versions_compare_head_v12_10.png
diff --git a/doc/user/project/merge_requests/versions.md b/doc/user/project/merge_requests/versions.md
index ffd0efb365a..87c10717671 100644
--- a/doc/user/project/merge_requests/versions.md
+++ b/doc/user/project/merge_requests/versions.md
@@ -46,6 +46,27 @@ This only applies to commits that are in the most recent version of a merge
 request - if a commit was in a merge request, then rebased out of that merge
 request, they will not be linked.
 
+## `HEAD` comparison mode for Merge Requests
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/27008) in GitLab 12.10.
+
+Merge Requests, particularly the **Changes** tab, is where source code
+is reviewed and discussed. In circumstances where the target branch was
+merged into the source branch of the merge request, the changes in the
+source and target branch can be shown mixed together making it hard to
+understand which changes are being added and which already exist in the
+target branch.
+
+In GitLab 12.10, we added an **experimental** comparison mode, which
+shows a diff calculated by simulating how it would look like once merged - a more accurate
+representation of the changes rather than using the base of the two
+branches. The new mode is available from the comparison target drop down
+by selecting **master (HEAD)**. In the future it will
+[replace](https://gitlab.com/gitlab-org/gitlab/issues/198458) the
+current default comparison.
+
+![Merge request versions compare HEAD](img/versions_compare_head_v12_10.png)
+
 <!-- ## Troubleshooting
 
 Include any troubleshooting steps that you can foresee. If you know beforehand what issues
diff --git a/doc/user/project/quick_actions.md b/doc/user/project/quick_actions.md
index 91138adb996..7937b7193d2 100644
--- a/doc/user/project/quick_actions.md
+++ b/doc/user/project/quick_actions.md
@@ -70,7 +70,7 @@ The following quick actions are applicable to descriptions, discussions and thre
 | `/wip`                                |       | ✓             |      | Toggle the Work In Progress status |
 | `/approve`                            |       | ✓             |      | Approve the merge request **(STARTER)** |
 | `/submit_review`                      |       | ✓             |      | Submit a pending review. ([Introduced in GitLab 12.7](https://gitlab.com/gitlab-org/gitlab/issues/8041)) **(PREMIUM)** |
-| `/merge`                              |       | ✓             |      | Merge (when pipeline succeeds) |
+| `/merge`                              |       | ✓             |      | Merge changes. Depending on the project setting, this may be [when the pipeline succeeds](merge_requests/merge_when_pipeline_succeeds.md), adding to a [Merge Train](../../ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md), etc).  |
 | `/child_epic <epic>`                  |       |               | ✓    | Add child epic to `<epic>`. The `<epic>` value should be in the format of `&epic`, `group&epic`, or a URL to an epic. ([Introduced in GitLab 12.0](https://gitlab.com/gitlab-org/gitlab/issues/7330)) **(ULTIMATE)** |
 | `/remove_child_epic <epic>`           |       |               | ✓    | Remove child epic from `<epic>`. The `<epic>` value should be in the format of `&epic`, `group&epic`, or a URL to an epic. ([Introduced in GitLab 12.0](https://gitlab.com/gitlab-org/gitlab/issues/7330)) **(ULTIMATE)** |
 | `/parent_epic <epic>`                 |       |               | ✓    | Set parent epic to `<epic>`. The `<epic>` value should be in the format of `&epic`, `group&epic`, or a URL to an epic. ([introduced in GitLab 12.1](https://gitlab.com/gitlab-org/gitlab/issues/10556)) **(ULTIMATE)** |
diff --git a/doc/user/project/releases/index.md b/doc/user/project/releases/index.md
index bae514153ac..ca28a79abf4 100644
--- a/doc/user/project/releases/index.md
+++ b/doc/user/project/releases/index.md
@@ -64,9 +64,6 @@ A link is any URL which can point to whatever you like; documentation, built
 binaries, or other related materials. These can be both internal or external
 links from your GitLab instance.
 
-NOTE: **NOTE**
-You can manipulate links of each release entry with [Release Links API](../../../api/releases/links.md)
-
 #### Permanent links to Release assets
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/27300) in GitLab 12.9.
@@ -201,6 +198,14 @@ milestones, or release date, use the [Releases
 API](../../../api/releases/index.md#update-a-release). Editing this information
 through the **Edit Release** page is planned for a future version of GitLab.
 
+Please note that the ability to edit asset links is currently behind a feature
+flag which is disabled by default. For self-managed instances, it can be enabled
+through the Rails console by a GitLab administrator with the following command:
+
+```ruby
+Feature.enable(:release_asset_link_editing)
+```
+
 ## Notification for Releases
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/26001) in GitLab 12.4.
diff --git a/doc/user/project/repository/forking_workflow.md b/doc/user/project/repository/forking_workflow.md
index c26f2bd6b1d..126144de703 100644
--- a/doc/user/project/repository/forking_workflow.md
+++ b/doc/user/project/repository/forking_workflow.md
@@ -34,6 +34,12 @@ CAUTION: **Caution:**
 In GitLab 12.6 and later, when project owners [reduce a project's visibility](../../../public_access/public_access.md#reducing-visibility),
 it **removes the relationship** between a project and all its forks.
 
+CAUTION: **Caution:**
+When a public project with the repository feature set to "Members
+only" is forked, the repository will be public in the fork. The owner
+of the fork will need to manually change the visibility. This is being
+fixed in [#36662](https://gitlab.com/gitlab-org/gitlab/-/issues/36662).
+
 ## Repository mirroring
 
 You can use [repository mirroring](repository_mirroring.md) to keep your fork synced with the original repository. You can also use `git remote add upstream` to achieve the same result.
diff --git a/doc/user/project/repository/img/file_ext_icons_repo_v12_10.png b/doc/user/project/repository/img/file_ext_icons_repo_v12_10.png
new file mode 100644
index 00000000000..346f0e58325
--- /dev/null
+++ b/doc/user/project/repository/img/file_ext_icons_repo_v12_10.png
diff --git a/doc/user/project/repository/index.md b/doc/user/project/repository/index.md
index a9647a9ed0f..f9c953db3e3 100644
--- a/doc/user/project/repository/index.md
+++ b/doc/user/project/repository/index.md
@@ -27,6 +27,12 @@ that you [connect with GitLab via SSH](../../../ssh/README.md).
 
 ## Files
 
+Use a repository to store your files in GitLab. From [GitLab 12.10 onwards](https://gitlab.com/gitlab-org/gitlab/issues/33806),
+you'll see on the repository's file tree an icon next to the file name
+according to its extension:
+
+![Repository file icons](img/file_ext_icons_repo_v12_10.png)
+
 ### Create and edit files
 
 Host your codebase in GitLab repositories by pushing your files to GitLab.
diff --git a/doc/user/project/requirements/img/requirement_archive_view_v12_10.png b/doc/user/project/requirements/img/requirement_archive_view_v12_10.png
new file mode 100644
index 00000000000..b3a52caba6c
--- /dev/null
+++ b/doc/user/project/requirements/img/requirement_archive_view_v12_10.png
diff --git a/doc/user/project/requirements/img/requirement_create_view_v12_10.png b/doc/user/project/requirements/img/requirement_create_view_v12_10.png
new file mode 100644
index 00000000000..ecb08fe8a8b
--- /dev/null
+++ b/doc/user/project/requirements/img/requirement_create_view_v12_10.png
diff --git a/doc/user/project/requirements/img/requirement_edit_save_v12_10.png b/doc/user/project/requirements/img/requirement_edit_save_v12_10.png
new file mode 100644
index 00000000000..6cf7db361b8
--- /dev/null
+++ b/doc/user/project/requirements/img/requirement_edit_save_v12_10.png
diff --git a/doc/user/project/requirements/img/requirement_edit_view_v12_10.png b/doc/user/project/requirements/img/requirement_edit_view_v12_10.png
new file mode 100644
index 00000000000..5251e7eae1e
--- /dev/null
+++ b/doc/user/project/requirements/img/requirement_edit_view_v12_10.png
diff --git a/doc/user/project/requirements/img/requirements_archived_list_view_v12_10.png b/doc/user/project/requirements/img/requirements_archived_list_view_v12_10.png
new file mode 100644
index 00000000000..a5487b46894
--- /dev/null
+++ b/doc/user/project/requirements/img/requirements_archived_list_view_v12_10.png
diff --git a/doc/user/project/requirements/img/requirements_list_view_v12_10.png b/doc/user/project/requirements/img/requirements_list_view_v12_10.png
new file mode 100644
index 00000000000..cee1f3781f6
--- /dev/null
+++ b/doc/user/project/requirements/img/requirements_list_view_v12_10.png
diff --git a/doc/user/project/requirements/index.md b/doc/user/project/requirements/index.md
new file mode 100644
index 00000000000..8f4ec7bbbed
--- /dev/null
+++ b/doc/user/project/requirements/index.md
@@ -0,0 +1,67 @@
+---
+type: reference, howto
+---
+
+# Requirements **(ULTIMATE)**
+
+> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/2703) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 12.10.
+
+Requirements allow you to create criteria to check your products against. They
+can be based on users, stakeholders, system, software, or anything else you
+find important to capture.
+
+![requirements list view](img/requirements_list_view_v12_10.png)
+
+## Create a requirement
+
+A paginated list of requirements is available in each project, and there you
+can create a new requirement.
+
+To create a requirement:
+
+1. From your project page, go to **{requirements}** **Requirements**.
+1. Click **New requirement**.
+1. Enter a descriptive title and click **Create requirement**.
+
+You will see the newly created requirement on the top of the list, as the requirements
+list is sorted by creation date in descending order.
+
+![requirement create view](img/requirement_create_view_v12_10.png)
+
+## Edit a requirement
+
+You can edit a requirement (if you have the necessary privileges) from the requirements
+list page.
+
+To edit a requirement:
+
+1. From the requirements list, click the **Edit** (**{pencil}**) button.
+1. Update the title in text input field.
+1. Click **Save changes**.
+
+![requirement edit view](img/requirement_edit_view_v12_10.png)
+
+The requirements list shows the new title immediately.
+
+![requirement edit saved](img/requirement_edit_save_v12_10.png)
+
+## Archive a requirement
+
+You can archive an open requirement (if you have the necessary privileges) while
+you're in the **Open** tab.
+
+From the requirements list page, click the **Archive** (**{archive}**) button.
+
+![requirement archive view](img/requirement_archive_view_v12_10.png)
+
+As soon as a requirement is archived, it no longer appears in the **Open** tab.
+
+## Reopen a requirement
+
+You can view the list of archived requirements in the **Archived** tab.
+
+![archived requirements list](img/requirements_archived_list_view_v12_10.png)
+
+To reopen an archived requirement, click the **Reopen** button.
+
+As soon as a requirement is reopened, it no longer appears in the **Archived** tab.
diff --git a/doc/user/project/static_site_editor/img/edit_this_page_button_v12_10.png b/doc/user/project/static_site_editor/img/edit_this_page_button_v12_10.png
new file mode 100644
index 00000000000..380d96f1db9
--- /dev/null
+++ b/doc/user/project/static_site_editor/img/edit_this_page_button_v12_10.png
diff --git a/doc/user/project/static_site_editor/img/static_site_editor_v12_10.png b/doc/user/project/static_site_editor/img/static_site_editor_v12_10.png
new file mode 100644
index 00000000000..130dff9f30d
--- /dev/null
+++ b/doc/user/project/static_site_editor/img/static_site_editor_v12_10.png
diff --git a/doc/user/project/static_site_editor/index.md b/doc/user/project/static_site_editor/index.md
new file mode 100644
index 00000000000..f186ff9919e
--- /dev/null
+++ b/doc/user/project/static_site_editor/index.md
@@ -0,0 +1,89 @@
+---
+type: reference, how-to
+description: "The static site editor enables users to edit content on static websites without prior knowledge of the underlying templating language, site architecture or Git commands."
+---
+
+# Static Site Editor
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28758) in GitLab 12.10.
+
+Static Site Editor enables users to edit content on static websites without
+prior knowledge of the underlying templating language, site architecture, or
+Git commands. A contributor to your project can quickly edit a Markdown page
+and submit the changes for review.
+
+## Use cases
+
+The Static Site Editors allows collaborators to submit changes to static site
+files seamlessly. For example:
+
+- Non-technical collaborators can easily edit a page directly from the browser; they don't need to know Git and the details of your project to be able to contribute.
+- Recently hired team members can quickly edit content.
+- Temporary collaborators can jump from project to project and quickly edit pages instead of having to clone or fork every single project they need to submit changes to.
+
+## Requirements
+
+- In order use the Static Site Editor feature, your project needs to be
+pre-configured with the [Static Site Editor Middleman template](https://gitlab.com/gitlab-org/project-templates/static-site-editor-middleman).
+- The editor needs to be logged into GitLab and needs to be a member of the
+project (with Developer or higher permission levels).
+
+## How it works
+
+The Static Site Editor is in an early stage of development and only works for
+Middleman sites for now. You have to use a specific site template to start
+using it. The project template is configured to deploy a [Middleman](https://middlemanapp.com/)
+static website with [GitLab Pages](../pages/index.md).
+
+Once your website is up and running, you'll see a button **Edit this page** on
+the bottom-left corner of its pages:
+
+![Edit this page button](img/edit_this_page_button_v12_10.png)
+
+When clicking it, GitLab will open up an editor window from which the content
+can be directly edited. When you're ready, you can submit your changes in a
+click of a button:
+
+![Static Site Editor](img/static_site_editor_v12_10.png)
+
+When an editor submits their changes, in the background, GitLab automatically
+creates a new branch, commits their changes, and opens a merge request. The
+editor will land directly on the merge request, and then they can assign it to
+a colleague for review.
+
+## Getting started
+
+First, set up the project. Once done, you can use the Static Site Editor to
+easily edit your content.
+
+### Set up your project
+
+1. To get started, create a new project from the
+[Static Site Editor - Middleman](https://gitlab.com/gitlab-org/project-templates/static-site-editor-middleman)
+template. You can either [fork it](../repository/forking_workflow.md#creating-a-fork)
+or [create a new project from a template](../../../gitlab-basics/create-project.md#built-in-templates).
+1. Edit the `data/config.yml` file adding your project's path.
+1. Editing the file will trigger a CI/CD pipeline to deploy your project with GitLab Pages.
+1. When the pipeline finishes, from your project's left-side menu, go to **Settings > Pages** to find the URL of your new website.
+1. Visit your website and look at the bottom-left corner of the screen to see the new **Edit this page** button.
+
+Anyone satisfying the [requirements](#requirements) will be able to edit the
+content of the pages without prior knowledge of Git nor of your site's
+codebase.
+
+### Use the Static Site Editor to edit your content
+
+For instance, suppose you are a recently hired technical writer at a large
+company and a new feature has been added to the company product.
+
+1. You are assigned the task of updating the documentation.
+1. You visit a page and see content that needs to be edited.
+1. Click the **Edit this page** button on the production site.
+1. The file is opened in the Static Site Editor.
+1. You edit the file right there and click **Submit changes**.
+1. A new merge request is automatically created and you assign it to your colleague for review.
+
+## Limitations
+
+- Currently, the Static Site Editor only works for files ending in `.md`. For example, it will not work for a file `index.html.md.erb` while it works for `index.html.md`.
+- The Static Site Editor still cannot be quickly added to existing Middleman sites. Follow this [epic](https://gitlab.com/groups/gitlab-org/-/epics/2784) for updates.
diff --git a/doc/user/project/status_page/index.md b/doc/user/project/status_page/index.md
index 2a022fe472d..d292ca94ba9 100644
--- a/doc/user/project/status_page/index.md
+++ b/doc/user/project/status_page/index.md
@@ -78,10 +78,16 @@ To publish an Incident, you first need to create an issue in the Project you ena
 
 Once this issue is created, a background worker will publish the issue onto the status page using the credentials you provided during setup.
 
+NOTE: **Note:**
+Confidential issues are not published. If a published issue is made confidential it will be unpublished.
+
 ### Publishing updates
 
 To publish an update to the Incident, update the incident issue's description.
 
+CAUTION: **Caution:**
+When referenced issues are changed (e.g. title, confidentiality) the incident they were referenced in are not updated automatically.
+
 ### Adding comments
 
 To add comments to the Status Page Incident, create a comment on the incident issue.
diff --git a/doc/user/project/wiki/index.md b/doc/user/project/wiki/index.md
index 3255e3a5477..88b729272ec 100644
--- a/doc/user/project/wiki/index.md
+++ b/doc/user/project/wiki/index.md
@@ -140,6 +140,43 @@ number.
 
 ![Wiki page history](img/wiki_page_history.png)
 
+## Wiki activity records
+
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/14902) in GitLab 12.10.
+> - It's deployed behind a feature flag, disabled by default.
+> - It's enabled on GitLab.com.
+> - To use it in GitLab self-managed instances, ask a GitLab administrator to [enable it](#enable-or-disable-wiki-events-core-only). **(CORE ONLY)**
+
+Wiki events (creation, deletion, and updates) are tracked by GitLab and
+displayed on the [user profile](../../profile/index.md#user-profile),
+[group](../../group/index.md#view-group-activity),
+and [project](../index.md#project-activity) activity pages.
+
+### Limitations
+
+Only edits made in the browser or through the API have their activity recorded.
+Edits made and pushed through Git are not currently listed in the activity list.
+
+### Enable or disable Wiki Events **(CORE ONLY)**
+
+Wiki event activity is under development and not ready for production use. It is
+deployed behind a feature flag that is **disabled by default**.
+[GitLab administrators with access to the GitLab Rails console](../../../administration/troubleshooting/navigating_gitlab_via_rails_console.md#starting-a-rails-console-session)
+can enable it for your instance. You're welcome to test it, but use it at your
+own risk.
+
+To enable it:
+
+```ruby
+Feature.enable(:wiki_events)
+```
+
+To disable it:
+
+```ruby
+Feature.disable(:wiki_events)
+```
+
 ## Adding and editing wiki pages locally
 
 Since wikis are based on Git repositories, you can clone them locally and edit