Add latest changes from gitlab-org/gitlab@master

2 files changed, 31 insertions, 23 deletions

diff --git a/doc/user/project/issues/index.md b/doc/user/project/issues/index.md
index 3016ea9cc14..16208c9196e 100644
--- a/doc/user/project/issues/index.md
+++ b/doc/user/project/issues/index.md
@@ -4,7 +4,7 @@ group: Project Management
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# Issues
+# Issues **(CORE)**
 
 Issues are the fundamental medium for collaborating on ideas and planning work in GitLab.
 
@@ -191,6 +191,7 @@ requires [GraphQL](../../../api/graphql/index.md) to be enabled.
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/36427) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 12.10.
 > - Health status of closed issues [can't be edited](https://gitlab.com/gitlab-org/gitlab/-/issues/220867) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.4 and later.
 > - Issue health status visible in issue lists [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/45141) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.6.
+> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/issues/213567) in GitLab 13.7.
 
 To help you track the status of your issues, you can assign a status to each issue to flag work
 that's progressing as planned or needs attention to keep on schedule:
@@ -207,16 +208,6 @@ until the issue is reopened.
 You can then see issue statuses in the [issue list](#issues-list) and the
 [Epic tree](../../group/epics/index.md#issue-health-status-in-epic-tree).
 
-#### Disable issue health status
-
-This feature comes with the `:save_issuable_health_status` feature flag enabled by default. However, in some cases
-this feature is incompatible with old configuration. To turn off the feature while configuration is
-migrated, ask a GitLab administrator with Rails console access to run the following command:
-
-```ruby
-Feature.disable(:save_issuable_health_status)
-```
-
 ## Other Issue actions
 
 - [Create an issue from a template](../../project/description_templates.md#using-the-templates)
diff --git a/doc/user/project/issues/sorting_issue_lists.md b/doc/user/project/issues/sorting_issue_lists.md
index 27aa5231a2e..b4cb1c383ba 100644
--- a/doc/user/project/issues/sorting_issue_lists.md
+++ b/doc/user/project/issues/sorting_issue_lists.md
@@ -4,10 +4,21 @@ group: Project Management
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# Sorting and ordering issue lists
+# Sorting and ordering issue lists **(CORE)**
 
-You can sort a list of issues several ways, including by issue creation date, milestone due date,
-etc. The available sorting options can change based on the context of the list.
+You can sort a list of issues several ways, including by:
+
+- Blocking
+- Created date
+- Due date
+- Label priority
+- Last updated
+- Milestone due date
+- Popularity
+- Priority
+- Weight
+
+The available sorting options can change based on the context of the list.
 For sorting by issue priority, see [Label Priority](../labels.md#label-priority).
 
 In group and project issue lists, it is also possible to order issues manually,
@@ -18,19 +29,25 @@ similar to [issue boards](../issue_board.md#how-gitlab-orders-issues-in-a-list).
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/62178) in GitLab 12.2.
 
 When you select **Manual** sorting, you can change
-the order by dragging and dropping the issues. The changed order will persist. Everyone who visits the same list will see the reordered list, with some exceptions.
+the order by dragging and dropping the issues. The changed order persists, and
+everyone who visits the same list sees the updated issue order, with some exceptions.
 
 Each issue is assigned a relative order value, representing its relative
-order with respect to the other issues in the list. When you drag-and-drop reorder
-an issue, its relative order value changes accordingly.
+order with respect to the other issues on the list. When you drag-and-drop reorder
+an issue, its relative order value changes.
 
-In addition, any time that issue appears in a manually sorted list,
-the updated relative order value will be used for the ordering. This means that
-if issue `A` is drag-and-drop reordered to be above issue `B` by any user in
-a given list inside your GitLab instance, any time those two issues are subsequently
-loaded in any list in the same instance (could be a different project issue list or a
-different group issue list, for example), that ordering will be maintained.
+In addition, any time an issue appears in a manually sorted list,
+the updated relative order value is used for the ordering.
+So, if anyone drags issue `A` above issue `B` in your GitLab instance,
+this ordering is maintained whenever they appear together in any list.
 
 This ordering also affects [issue boards](../issue_board.md#how-gitlab-orders-issues-in-a-list).
 Changing the order in an issue list changes the ordering in an issue board,
 and vice versa.
+
+## Sorting by blocking issues
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/34247/) in GitLab 13.7.
+
+When you select to sort by **Blocking**, the issue list changes to sort descending by the
+number of issues each issue is blocking. You can use this to determine the critical path for your backlog.