Update quick actions table and combine with epics

Also fix links to renamed headers and moved content

4 files changed, 65 insertions, 88 deletions

diff --git a/doc/user/group/epics/index.md b/doc/user/group/epics/index.md
index 5968b91c9b7..b947a587b2b 100644
--- a/doc/user/group/epics/index.md
+++ b/doc/user/group/epics/index.md
@@ -4,7 +4,7 @@ type: reference, howto
 
 # Epics **(ULTIMATE)**
 
-> Introduced in [GitLab Ultimate][ee] 10.2.
+> Introduced in [GitLab Ultimate](https://about.gitlab.com/pricing/) 10.2.
 
 Epics let you manage your portfolio of projects more efficiently and with less
 effort by tracking groups of issues that share a theme, across projects and
@@ -116,7 +116,7 @@ To apply labels across multiple epics:
 ## Deleting an epic
 
 NOTE: **Note:**
-To delete an epic, you need to be an [Owner][permissions] of a group/subgroup.
+To delete an epic, you need to be an [Owner](../../permissions.md#group-members-permissions) of a group/subgroup.
 
 When inside a single epic view, click the **Delete** button to delete the epic.
 A modal will pop-up to confirm your action.
@@ -154,7 +154,7 @@ link in the issue sidebar.
 
 If you have [permissions](../../permissions.md) to close an issue and create an
 epic in the parent group, you can promote an issue to an epic with the `/promote`
-[quick action](../../project/quick_actions.md#quick-actions-for-epics-ultimate).
+[quick action](../../project/quick_actions.md#quick-actions-for-issues-merge-requests-and-epics).
 Only issues from projects that are in groups can be promoted.
 
 When the quick action is executed:
@@ -171,7 +171,7 @@ The following issue metadata will be copied to the epic:
 
 ## Searching for an epic from epics list page
 
-> Introduced in [GitLab Ultimate][ee] 10.5.
+> Introduced in [GitLab Ultimate](https://about.gitlab.com/pricing/) 10.5.
 
 You can search for an epic from the list of epics using filtered search bar (similar to
 that of Issues and Merge requests) based on following parameters:
@@ -210,10 +210,7 @@ Note that for a given group, the visibility of all projects must be the same as
 the group, or less restrictive. That means if you have access to a group's epic,
 then you already have access to its projects' issues.
 
-You may also consult the [group permissions table][permissions].
-
-[ee]: https://about.gitlab.com/pricing/
-[permissions]: ../../permissions.md#group-members-permissions
+You may also consult the [group permissions table](../../permissions.md#group-members-permissions).
 
 ## Thread
 
diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md
index a94057dc3a1..d6da8cb99c7 100644
--- a/doc/user/project/merge_requests/index.md
+++ b/doc/user/project/merge_requests/index.md
@@ -218,7 +218,7 @@ Similarly, assignees are removed by deselecting them from the same dropdown menu
 It's also possible to manage multiple assignees:
 
 - When creating a merge request.
-- Using [quick actions](../quick_actions.md#quick-actions-for-issues-and-merge-requests).
+- Using [quick actions](../quick_actions.md#quick-actions-for-issues-merge-requests-and-epics).
 
 ## Resolve conflicts
 
diff --git a/doc/user/project/merge_requests/work_in_progress_merge_requests.md b/doc/user/project/merge_requests/work_in_progress_merge_requests.md
index ea59644fce6..8ac4131e10b 100644
--- a/doc/user/project/merge_requests/work_in_progress_merge_requests.md
+++ b/doc/user/project/merge_requests/work_in_progress_merge_requests.md
@@ -18,7 +18,7 @@ There are several ways to flag a merge request as a Work In Progress:
 - Add `[WIP]` or `WIP:` to the start of the merge request's title. Clicking on
   **Start the title with WIP:**, under the title box, when editing the merge request's
   description will have the same effect.
-- Add the `/wip` [quick action](../quick_actions.md#quick-actions-for-issues-and-merge-requests)
+- Add the `/wip` [quick action](../quick_actions.md#quick-actions-for-issues-merge-requests-and-epics)
   in a comment in the merge request. This is a toggle, and can be repeated
   to change the status back. Note that any other text in the comment will be discarded.
 - Add "wip" or "WIP" to the start of a commit message targeting the merge request's
@@ -33,7 +33,7 @@ Similar to above, when a Merge Request is ready to be merged, you can remove the
 - Remove `[WIP]` or `WIP:` from the start of the merge request's title. Clicking on
   **Remove the WIP: prefix from the title**, under the title box, when editing the merge
   request's description, will have the same effect.
-- Add the `/wip` [quick action](../quick_actions.md#quick-actions-for-issues-and-merge-requests)
+- Add the `/wip` [quick action](../quick_actions.md#quick-actions-for-issues-merge-requests-and-epics)
   in a comment in the merge request. This is a toggle, and can be repeated
   to change the status back. Note that any other text in the comment will be discarded.
 - Click on the **Resolve WIP status** button near the bottom of the merge request description,
diff --git a/doc/user/project/quick_actions.md b/doc/user/project/quick_actions.md
index 647250bd02a..e373d605098 100644
--- a/doc/user/project/quick_actions.md
+++ b/doc/user/project/quick_actions.md
@@ -12,59 +12,63 @@ on a separate line in order to be properly detected and executed. Once executed,
 
 > From [GitLab 12.1](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/26672), an alert is displayed when a quick action is successfully applied.
 
-## Quick Actions for issues and merge requests
-
-The following quick actions are applicable to both issues and merge requests threads,
-discussions, and descriptions:
-
-| Command                    | Action                         | Issue | Merge request |
-|:---------------------------|:------------------------------ |:------|:--------------|
-| `/tableflip <Comment>`     | Append the comment with `(╯°□°)╯︵ ┻━┻` | ✓ | ✓        |
-| `/shrug <Comment>`         | Append the comment with `¯\＿(ツ)＿/¯` | ✓ | ✓         |
-| `/todo`                    | Add a To Do                    | ✓     | ✓             |
-| `/done`                    | Mark To Do as done             | ✓     | ✓             |
-| `/subscribe`               | Subscribe                      | ✓     | ✓             |
-| `/unsubscribe`             | Unsubscribe                    | ✓     | ✓             |
-| `/close`                   | Close                          | ✓     | ✓             |
-| `/reopen`                  | Reopen                         | ✓     | ✓             |
-| `/title <New title>`       | Change title                   | ✓     |  ✓            |
-| `/award :emoji:`           | Toggle emoji award             | ✓     | ✓             |
-| `/assign me`               | Assign yourself                | ✓     | ✓             |
-| `/assign @user`            | Assign one user                | ✓     | ✓             |
-| `/assign @user1 @user2`    | Assign multiple users **(STARTER)** | ✓ | ✓            |
-| `/unassign @user1 @user2`  | Remove assignee(s) **(STARTER)** | ✓     | ✓             |
-| `/reassign @user1 @user2`  | Change assignee **(STARTER)**  | ✓     | ✓             |
-| `/unassign`                | Remove current assignee        | ✓     | ✓             |
-| `/milestone %milestone`    | Set milestone                  | ✓     | ✓             |
-| `/remove_milestone`        | Remove milestone               | ✓     | ✓             |
-| `/label ~label1 ~label2`   | Add label(s). Label names can also start without ~ but mixed syntax is not supported.                   | ✓     | ✓             |
-| `/unlabel ~label1 ~label2` | Remove all or specific label(s)| ✓     | ✓             |
-| `/relabel ~label1 ~label2` | Replace existing label(s) with those specified | ✓     | ✓             |
-| `/copy_metadata <#issue>` | Copy labels and milestone from another issue in the project | ✓     | ✓             |
-| `/copy_metadata <!merge_request>` | Copy labels and milestone from another merge request in the project | ✓     | ✓             |
-| `/estimate <1w 3d 2h 14m>` | Set time estimate | ✓     | ✓             |
-| `/remove_estimate`       | Remove time estimate             | ✓     | ✓             |
-| `/spend <time(1h 30m)> <date(YYYY-MM-DD)>` | Add spent time; optionally, specify the date that time was spent on | ✓     | ✓             |
-| `/spend <time(-1h 5m)> <date(YYYY-MM-DD)>` | Subtract spent time; optionally, specify the date that time was spent on | ✓     | ✓             |
-| `/remove_time_spent`       | Remove time spent              | ✓     | ✓             |
-| `/lock`                    | Lock the thread                | ✓     | ✓             |
-| `/unlock`                  | Unlock the thread              | ✓     | ✓             |
-| `/due <date>` | Set due date. Examples of valid `<date>` include `in 2 days`, `this Friday` and `December 31st`. | ✓ | |
-| `/remove_due_date`         | Remove due date                | ✓     |               |
-| `/weight <value>` | Set weight. Valid options for `<value>` include `0`, `1`, `2`, etc. **(STARTER)**       | ✓     |               |
-| `/clear_weight`            | Clears weight **(STARTER)**    | ✓     |               |
-| `/epic <epic>` | Add to epic `<epic>`. The `<epic>` value should be in the format of `&epic`, `group&epic` or `epic-URL`. **(ULTIMATE)** | ✓ |             |
-| `/remove_epic`             | Removes from epic **(ULTIMATE)** | ✓   |               |
-| `/promote`                 | Promote issue to epic **(ULTIMATE)** | ✓   |               |
-| `/confidential`            | Make confidential              | ✓     |               |
-| `/duplicate <#issue>`        | Mark this issue as a duplicate of another issue | ✓    |
-| `/move <path/to/project>`    | Move this issue to another project | ✓ |               |
-| `/target_branch <Local branch Name>` | Set target branch    |       | ✓             |
-| `/wip`                     | Toggle the Work In Progress status |   | ✓             |
-| `/approve`                 | Approve the merge request      |       | ✓             |
-| `/merge`                   | Merge (when pipeline succeeds) |       | ✓             |
-| `/create_merge_request <branch name>` | Create a new merge request starting from the current issue | ✓ | |
-| `/relate #issue1 #issue2`  | Mark issues as related **(STARTER)** | ✓     |               |
+## Quick Actions for issues, merge requests and epics
+
+The following quick actions are applicable to descriptions, discussions and threads
+in issues and merge requests, as well as epics.**(ULTIMATE)**
+
+| Command                               | Issue | Merge request | Epic | Action |
+|:--------------------------------------|:------|:--------------|:-----|:------ |
+| `/tableflip <comment>`                | ✓     | ✓             | ✓    | Append the comment with `(╯°□°)╯︵ ┻━┻` |
+| `/shrug <comment>`                    | ✓     | ✓             | ✓    | Append the comment with `¯\＿(ツ)＿/¯` |
+| `/todo`                               | ✓     | ✓             | ✓    | Add a To Do |
+| `/done`                               | ✓     | ✓             | ✓    | Mark To Do as done |
+| `/subscribe`                          | ✓     | ✓             | ✓    | Subscribe |
+| `/unsubscribe`                        | ✓     | ✓             | ✓    | Unsubscribe |
+| `/close`                              | ✓     | ✓             | ✓    | Close |
+| `/reopen`                             | ✓     | ✓             | ✓    | Reopen |
+| `/title <new title>`                  | ✓     | ✓             | ✓    | Change title |
+| `/award :emoji:`                      | ✓     | ✓             | ✓    | Toggle emoji award |
+| `/assign me`                          | ✓     | ✓             |      | Assign yourself |
+| `/assign @user`                       | ✓     | ✓             |      | Assign one user |
+| `/assign @user1 @user2`               | ✓     | ✓             |      | Assign multiple users **(STARTER)** |
+| `/reassign @user1 @user2`             | ✓     | ✓             |      | Change assignee **(STARTER)** |
+| `/unassign`                           | ✓     | ✓             |      | Remove current assignee |
+| `/unassign @user1 @user2`             | ✓     | ✓             |      | Remove assignee(s) **(STARTER)** |
+| `/milestone %milestone`               | ✓     | ✓             |      | Set milestone |
+| `/remove_milestone`                   | ✓     | ✓             |      | Remove milestone |
+| `/label ~label1 ~label2`              | ✓     | ✓             | ✓    | Add label(s). Label names can also start without `~` but mixed syntax is not supported |
+| `/relabel ~label1 ~label2`            | ✓     | ✓             | ✓    | Replace existing label(s) with those specified |
+| `/unlabel ~label1 ~label2`            | ✓     | ✓             | ✓    | Remove all or specific label(s) |
+| `/copy_metadata <#issue>`             | ✓     | ✓             |      | Copy labels and milestone from another issue in the project |
+| `/copy_metadata <!merge_request>`     | ✓     | ✓             |      | Copy labels and milestone from another merge request in the project |
+| `/estimate <<W>w <DD>d <hh>h <mm>m>`  | ✓     | ✓             |      | Set time estimate. For example, `/estimate 1w 3d 2h 14m` |
+| `/remove_estimate`                    | ✓     | ✓             |      | Remove time estimate |
+| `/spend <time(<h>h <mm>m)> <date(<YYYY-MM-DD>)>` | ✓ | ✓      |      | Add spent time; optionally specify the date that time was spent on. For example, `/spend time(1h 30m)` or `/spend time(1h 30m) date(2018-08-26)` |
+| `/spend <time(-<h>h <mm>m)> <date(<YYYY-MM-DD>)>` | ✓ | ✓     |      | Subtract spent time; optionally specify the date that time was spent on. For example, `/spend time(-1h 30m)` or `/spend time(-1h 30m) date(2018-08-26)` |
+| `/remove_time_spent`                  | ✓     | ✓             |      | Remove time spent |
+| `/lock`                               | ✓     | ✓             |      | Lock the thread |
+| `/unlock`                             | ✓     | ✓             |      | Unlock the thread |
+| `/due <date>`                         | ✓     |               |      | Set due date. Examples of valid `<date>` include `in 2 days`, `this Friday` and `December 31st` |
+| `/remove_due_date`                    | ✓     |               |      | Remove due date |
+| `/weight <value>`                     | ✓     |               |      | Set weight. Valid options for `<value>` include `0`, `1`, `2`, etc **(STARTER)** |
+| `/clear_weight`                       | ✓     |               |      | Clear weight **(STARTER)** |
+| `/epic <epic>`                        | ✓     |               |      | Add to epic `<epic>`. The `<epic>` value should be in the format of `&epic`, `group&epic`, or a URL to an epic. **(ULTIMATE)** |
+| `/remove_epic`                        | ✓     |               |      | Remove from epic **(ULTIMATE)** |
+| `/promote`                            | ✓     |               |      | Promote issue to epic **(ULTIMATE)** |
+| `/confidential`                       | ✓     |               |      | Make confidential |
+| `/duplicate <#issue>`                 | ✓     |               |      | Mark this issue as a duplicate of another issue |
+| `/create_merge_request <branch name>` | ✓     |               |      | Create a new merge request starting from the current issue |
+| `/relate #issue1 #issue2`             | ✓     |               |      | Mark issues as related **(STARTER)** |
+| `/move <path/to/project>`             | ✓     |               |      | Move this issue to another project |
+| `/target_branch <local branch name>`  |       | ✓             |      | Set target branch |
+| `/wip`                                |       | ✓             |      | Toggle the Work In Progress status |
+| `/approve`                            |       | ✓             |      | Approve the merge request |
+| `/merge`                              |       | ✓             |      | Merge (when pipeline succeeds) |
+| `/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-ee/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-ee/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-ee/issues/10556)) **(ULTIMATE)** |
+| `/remove_parent_epic`                 |       |               | ✓    | Remove parent epic from epic ([introduced in GitLab 12.1](https://gitlab.com/gitlab-org/gitlab-ee/issues/10556)) **(ULTIMATE)** |
 
 ## Autocomplete characters
 
@@ -93,30 +97,6 @@ The following quick actions are applicable for commit messages:
 |:------------------------|:------------------------------------------|
 | `/tag v1.2.3 <message>` | Tags this commit with an optional message |
 
-## Quick actions for Epics **(ULTIMATE)**
-
-The following quick actions are applicable for epics threads and description:
-
-| Command                    | Action                                  |
-|:---------------------------|:----------------------------------------|
-| `/tableflip <Comment>`     | Append the comment with `(╯°□°)╯︵ ┻━┻` |
-| `/shrug <Comment>`         | Append the comment with `¯\＿(ツ)＿/¯`  |
-| `/todo`                    | Add a To Do                              |
-| `/done`                    | Mark To Do as done                       |
-| `/subscribe`               | Subscribe                               |
-| `/unsubscribe`             | Unsubscribe                             |
-| `/close`                   | Close                                   |
-| `/reopen`                  | Reopen                                  |
-| `/title <New title>`       | Change title                            |
-| `/award :emoji:`           | Toggle emoji award                      |
-| `/label ~label1 ~label2`   | Add label(s)                            |
-| `/unlabel ~label1 ~label2` | Remove all or specific label(s)         |
-| `/relabel ~label1 ~label2` | Replace existing label(s) with those specified |
-| `/child_epic <epic>` | Adds child epic to `<epic>`. The `<epic>` value should be in the format of `&epic`, `group&epic` or `epic-URL`. ([Introduced in GitLab 12.0](https://gitlab.com/gitlab-org/gitlab-ee/issues/7330)) **(ULTIMATE)**|
-| `/remove_child_epic <epic>` | Removes child epic from `<epic>`. The `<epic>` value should be in the format of `&epic`, `group&epic` or `epic-URL`. ([Introduced in GitLab 12.0](https://gitlab.com/gitlab-org/gitlab-ee/issues/7330)) **(ULTIMATE)** |
-| `/parent_epic <epic>` | Sets parent epic to `<epic>`. The `<epic>` value should be in the format of `&epic`, `group&epic` or `epic-URL`. ([introduced in GitLab 12.1](https://gitlab.com/gitlab-org/gitlab-ee/issues/10556)) **(ULTIMATE)** |
-| `/remove_parent_epic` | Removes parent epic from epic ([introduced in GitLab 12.1](https://gitlab.com/gitlab-org/gitlab-ee/issues/10556)) |
-
 <!-- ## Troubleshooting
 
 Include any troubleshooting steps that you can foresee. If you know beforehand what issues