Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-04-21 09:09:28 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-04-21 09:09:28 +0300
commit430aebe8afe80c67d1bafcc5c68cd28e5f207639 (patch)
tree4f13e7a76265b5240aae237369172e9fa75525ac /doc
parentb37b86966c1ac0a113d6028d73595170334deec6 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r--doc/user/application_security/dast/index.md4
-rw-r--r--doc/user/application_security/sast/index.md4
-rw-r--r--doc/user/group/bulk_editing/img/bulk-editing_v13_2.pngbin123971 -> 0 bytes
-rw-r--r--doc/user/group/bulk_editing/img/bulk_editing_v13_11.pngbin0 -> 66392 bytes
-rw-r--r--doc/user/group/bulk_editing/index.md2
-rw-r--r--doc/user/group/epics/img/epic_board_v13_10.pngbin60672 -> 42037 bytes
-rw-r--r--doc/user/group/epics/img/epic_view_roadmap_v12_9.pngbin127201 -> 105562 bytes
-rw-r--r--doc/user/group/epics/img/epic_view_v13.0.pngbin54891 -> 51112 bytes
-rw-r--r--doc/user/group/roadmap/img/roadmap_view_v13_2.pngbin55061 -> 53200 bytes
-rw-r--r--doc/user/img/todos_icon.pngbin4910 -> 0 bytes
-rw-r--r--doc/user/img/todos_index.pngbin98239 -> 0 bytes
-rw-r--r--doc/user/img/todos_index_v13_11.pngbin0 -> 49150 bytes
-rw-r--r--doc/user/project/bulk_editing.md2
-rw-r--r--doc/user/project/img/bulk-editing_v13_2.pngbin132734 -> 0 bytes
-rw-r--r--doc/user/project/img/bulk_editing_v13_11.pngbin0 -> 71181 bytes
-rw-r--r--doc/user/project/import/img/jira/import_issues_from_jira_form_v13_2.pngbin55269 -> 52411 bytes
-rw-r--r--doc/user/project/issues/img/create_issue_from_group_level_issue_tracker.pngbin29358 -> 0 bytes
-rw-r--r--doc/user/project/issues/img/delete_issue.pngbin13973 -> 0 bytes
-rw-r--r--doc/user/project/issues/img/delete_issue_v13_11.pngbin0 -> 38915 bytes
-rw-r--r--doc/user/project/issues/img/issue_weight.pngbin69564 -> 0 bytes
-rw-r--r--doc/user/project/issues/img/issue_weight_v13_11.pngbin0 -> 14914 bytes
-rw-r--r--doc/user/project/issues/img/merge_request_closes_issue.pngbin19423 -> 0 bytes
-rw-r--r--doc/user/project/issues/img/merge_request_closes_issue_v13_11.pngbin0 -> 15436 bytes
-rw-r--r--doc/user/project/issues/img/select_project_from_group_level_issue_tracker.pngbin23706 -> 0 bytes
-rw-r--r--doc/user/project/issues/img/select_project_from_group_level_issue_tracker_v13_11.pngbin0 -> 8863 bytes
-rw-r--r--doc/user/project/issues/issue_weight.md12
-rw-r--r--doc/user/project/issues/managing_issues.md26
-rw-r--r--doc/user/project/milestones/img/milestones_new_group_milestone_v13_5.pngbin58686 -> 47296 bytes
-rw-r--r--doc/user/project/milestones/img/milestones_project_milestone_page.pngbin101911 -> 0 bytes
-rw-r--r--doc/user/project/milestones/img/milestones_project_milestone_page_sidebar_v13_11.pngbin0 -> 15315 bytes
-rw-r--r--doc/user/project/milestones/index.md26
-rw-r--r--doc/user/project/requirements/img/requirements_archived_list_view_v13_1.pngbin19539 -> 15962 bytes
-rw-r--r--doc/user/todos.md35
33 files changed, 55 insertions, 56 deletions
diff --git a/doc/user/application_security/dast/index.md b/doc/user/application_security/dast/index.md
index d3f679fe9dd..65ddece1bde 100644
--- a/doc/user/application_security/dast/index.md
+++ b/doc/user/application_security/dast/index.md
@@ -300,7 +300,7 @@ variables:
DAST_SUBMIT_FIELD: login # the `id` or `name` of the element that when clicked will submit the login form or the password form of a multi-page login process
DAST_FIRST_SUBMIT_FIELD: next # the `id` or `name` of the element that when clicked will submit the username form of a multi-page login process
DAST_EXCLUDE_URLS: http://example.com/sign-out,http://example.com/sign-out-2 # optional, URLs to skip during the authenticated scan; comma-separated, no spaces in between
- DAST_AUTH_VALIDATION_URL: http://example.com/loggedin_page # optional, a URL only accessible to logged in users that DAST can use to confirm successful authentication
+ DAST_AUTH_VERIFICATION_URL: http://example.com/loggedin_page # optional, a URL only accessible to logged in users that DAST can use to confirm successful authentication
```
The results are saved as a
@@ -645,7 +645,7 @@ DAST can be [configured](#customizing-the-dast-settings) using CI/CD variables.
| `DAST_API_SPECIFICATION` | URL or string | The API specification to import. The specification can be hosted at a URL, or the name of a file present in the `/zap/wrk` directory. `DAST_WEBSITE` must be specified if this is omitted. |
| `DAST_SPIDER_START_AT_HOST` | boolean | Set to `false` to prevent DAST from resetting the target to its host before scanning. When `true`, non-host targets `http://test.site/some_path` is reset to `http://test.site` before scan. Default: `true`. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/258805) in GitLab 13.6. |
| `DAST_AUTH_URL` | URL | The URL of the page containing the sign-in HTML form on the target website. `DAST_USERNAME` and `DAST_PASSWORD` are submitted with the login form to create an authenticated scan. Not supported for API scans. |
-| `DAST_AUTH_VALIDATION_URL` | URL | A URL only accessible to logged in users that DAST can use to confirm successful authentication. If provided, DAST will exit if it cannot access the URL. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/207335) in GitLab 13.8.
+| `DAST_AUTH_VERIFICATION_URL` | URL | A URL only accessible to logged in users that DAST can use to confirm successful authentication. If provided, DAST will exit if it cannot access the URL. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/207335) in GitLab 13.8.
| `DAST_USERNAME` | string | The username to authenticate to in the website. |
| `DAST_PASSWORD` | string | The password to authenticate to in the website. |
| `DAST_USERNAME_FIELD` | string | The name of username field at the sign-in HTML form. |
diff --git a/doc/user/application_security/sast/index.md b/doc/user/application_security/sast/index.md
index 0ae91b2db9a..41e57656fc7 100644
--- a/doc/user/application_security/sast/index.md
+++ b/doc/user/application_security/sast/index.md
@@ -247,8 +247,8 @@ You can customize the default scanning rules provided by our SAST analyzers.
Ruleset customization supports two capabilities:
-1. Disabling predefined rules
-1. Modifying the default behavior of a given analyzer
+1. Disabling predefined rules (available for all analyzers).
+1. Modifying the default behavior of a given analyzer (only available for `nodejs-scan` and `gosec`).
These capabilities can be used simultaneously.
diff --git a/doc/user/group/bulk_editing/img/bulk-editing_v13_2.png b/doc/user/group/bulk_editing/img/bulk-editing_v13_2.png
deleted file mode 100644
index 9f28fabdf0c..00000000000
--- a/doc/user/group/bulk_editing/img/bulk-editing_v13_2.png
+++ /dev/null
Binary files differ
diff --git a/doc/user/group/bulk_editing/img/bulk_editing_v13_11.png b/doc/user/group/bulk_editing/img/bulk_editing_v13_11.png
new file mode 100644
index 00000000000..4db2bbf264f
--- /dev/null
+++ b/doc/user/group/bulk_editing/img/bulk_editing_v13_11.png
Binary files differ
diff --git a/doc/user/group/bulk_editing/index.md b/doc/user/group/bulk_editing/index.md
index aa356bee8e3..2a3e010282f 100644
--- a/doc/user/group/bulk_editing/index.md
+++ b/doc/user/group/bulk_editing/index.md
@@ -15,7 +15,7 @@ can do it by bulk editing them, that is, editing them together.
Only the items visible on the current page are selected for bulk editing (up to 20).
-![Bulk editing](img/bulk-editing_v13_2.png)
+![Bulk editing](img/bulk_editing_v13_11.png)
## Bulk edit issues at the group level
diff --git a/doc/user/group/epics/img/epic_board_v13_10.png b/doc/user/group/epics/img/epic_board_v13_10.png
index 5a14d9288d3..85a131ea605 100644
--- a/doc/user/group/epics/img/epic_board_v13_10.png
+++ b/doc/user/group/epics/img/epic_board_v13_10.png
Binary files differ
diff --git a/doc/user/group/epics/img/epic_view_roadmap_v12_9.png b/doc/user/group/epics/img/epic_view_roadmap_v12_9.png
index 035adc5e7ac..e8224ced7e9 100644
--- a/doc/user/group/epics/img/epic_view_roadmap_v12_9.png
+++ b/doc/user/group/epics/img/epic_view_roadmap_v12_9.png
Binary files differ
diff --git a/doc/user/group/epics/img/epic_view_v13.0.png b/doc/user/group/epics/img/epic_view_v13.0.png
index b25a91d318a..c317a5707bc 100644
--- a/doc/user/group/epics/img/epic_view_v13.0.png
+++ b/doc/user/group/epics/img/epic_view_v13.0.png
Binary files differ
diff --git a/doc/user/group/roadmap/img/roadmap_view_v13_2.png b/doc/user/group/roadmap/img/roadmap_view_v13_2.png
index b4f889afaa4..94cf2258569 100644
--- a/doc/user/group/roadmap/img/roadmap_view_v13_2.png
+++ b/doc/user/group/roadmap/img/roadmap_view_v13_2.png
Binary files differ
diff --git a/doc/user/img/todos_icon.png b/doc/user/img/todos_icon.png
deleted file mode 100644
index 9fee4337a75..00000000000
--- a/doc/user/img/todos_icon.png
+++ /dev/null
Binary files differ
diff --git a/doc/user/img/todos_index.png b/doc/user/img/todos_index.png
deleted file mode 100644
index 99c1575d157..00000000000
--- a/doc/user/img/todos_index.png
+++ /dev/null
Binary files differ
diff --git a/doc/user/img/todos_index_v13_11.png b/doc/user/img/todos_index_v13_11.png
new file mode 100644
index 00000000000..eedb3045d39
--- /dev/null
+++ b/doc/user/img/todos_index_v13_11.png
Binary files differ
diff --git a/doc/user/project/bulk_editing.md b/doc/user/project/bulk_editing.md
index 76ae4cf596b..e3c60453388 100644
--- a/doc/user/project/bulk_editing.md
+++ b/doc/user/project/bulk_editing.md
@@ -16,7 +16,7 @@ by bulk editing them, that is, editing them together.
Only the items visible on the current page are selected for bulk editing (up to 20).
-![Bulk editing](img/bulk-editing_v13_2.png)
+![Bulk editing](img/bulk_editing_v13_11.png)
## Bulk edit issues at the project level
diff --git a/doc/user/project/img/bulk-editing_v13_2.png b/doc/user/project/img/bulk-editing_v13_2.png
deleted file mode 100644
index 871cb02c01f..00000000000
--- a/doc/user/project/img/bulk-editing_v13_2.png
+++ /dev/null
Binary files differ
diff --git a/doc/user/project/img/bulk_editing_v13_11.png b/doc/user/project/img/bulk_editing_v13_11.png
new file mode 100644
index 00000000000..220459dd30b
--- /dev/null
+++ b/doc/user/project/img/bulk_editing_v13_11.png
Binary files differ
diff --git a/doc/user/project/import/img/jira/import_issues_from_jira_form_v13_2.png b/doc/user/project/import/img/jira/import_issues_from_jira_form_v13_2.png
index 8a94d33d47b..dca60b2bc5c 100644
--- a/doc/user/project/import/img/jira/import_issues_from_jira_form_v13_2.png
+++ b/doc/user/project/import/img/jira/import_issues_from_jira_form_v13_2.png
Binary files differ
diff --git a/doc/user/project/issues/img/create_issue_from_group_level_issue_tracker.png b/doc/user/project/issues/img/create_issue_from_group_level_issue_tracker.png
deleted file mode 100644
index 8996490ae63..00000000000
--- a/doc/user/project/issues/img/create_issue_from_group_level_issue_tracker.png
+++ /dev/null
Binary files differ
diff --git a/doc/user/project/issues/img/delete_issue.png b/doc/user/project/issues/img/delete_issue.png
deleted file mode 100644
index 87ea65956fc..00000000000
--- a/doc/user/project/issues/img/delete_issue.png
+++ /dev/null
Binary files differ
diff --git a/doc/user/project/issues/img/delete_issue_v13_11.png b/doc/user/project/issues/img/delete_issue_v13_11.png
new file mode 100644
index 00000000000..d9905012eab
--- /dev/null
+++ b/doc/user/project/issues/img/delete_issue_v13_11.png
Binary files differ
diff --git a/doc/user/project/issues/img/issue_weight.png b/doc/user/project/issues/img/issue_weight.png
deleted file mode 100644
index 3800b5940b8..00000000000
--- a/doc/user/project/issues/img/issue_weight.png
+++ /dev/null
Binary files differ
diff --git a/doc/user/project/issues/img/issue_weight_v13_11.png b/doc/user/project/issues/img/issue_weight_v13_11.png
new file mode 100644
index 00000000000..842c154ea49
--- /dev/null
+++ b/doc/user/project/issues/img/issue_weight_v13_11.png
Binary files differ
diff --git a/doc/user/project/issues/img/merge_request_closes_issue.png b/doc/user/project/issues/img/merge_request_closes_issue.png
deleted file mode 100644
index 6fd27738843..00000000000
--- a/doc/user/project/issues/img/merge_request_closes_issue.png
+++ /dev/null
Binary files differ
diff --git a/doc/user/project/issues/img/merge_request_closes_issue_v13_11.png b/doc/user/project/issues/img/merge_request_closes_issue_v13_11.png
new file mode 100644
index 00000000000..26b42239c12
--- /dev/null
+++ b/doc/user/project/issues/img/merge_request_closes_issue_v13_11.png
Binary files differ
diff --git a/doc/user/project/issues/img/select_project_from_group_level_issue_tracker.png b/doc/user/project/issues/img/select_project_from_group_level_issue_tracker.png
deleted file mode 100644
index 97d93620b2a..00000000000
--- a/doc/user/project/issues/img/select_project_from_group_level_issue_tracker.png
+++ /dev/null
Binary files differ
diff --git a/doc/user/project/issues/img/select_project_from_group_level_issue_tracker_v13_11.png b/doc/user/project/issues/img/select_project_from_group_level_issue_tracker_v13_11.png
new file mode 100644
index 00000000000..4612ae254d4
--- /dev/null
+++ b/doc/user/project/issues/img/select_project_from_group_level_issue_tracker_v13_11.png
Binary files differ
diff --git a/doc/user/project/issues/issue_weight.md b/doc/user/project/issues/issue_weight.md
index b10debf9888..8f17f399cb0 100644
--- a/doc/user/project/issues/issue_weight.md
+++ b/doc/user/project/issues/issue_weight.md
@@ -7,22 +7,22 @@ info: To determine the technical writer assigned to the Stage/Group associated w
# Issue weight **(PREMIUM)**
-> - Moved to GitLab Premium in 13.9.
+> Moved to GitLab Premium in 13.9.
When you have a lot of issues, it can be hard to get an overview.
-By adding a weight to each issue, you can get a better idea of how much time,
-value or complexity a given issue has or costs.
+With weighted issues, you can get a better idea of how much time,
+value, or complexity a given issue has or costs.
You can set the weight of an issue during its creation, by changing the
value in the dropdown menu. You can set it to a non-negative integer
value from 0, 1, 2, and so on. (The database stores a 4-byte value, so the
-upper bound is essentially limitless).
+upper bound is essentially limitless.)
You can remove weight from an issue
as well.
This value appears on the right sidebar of an individual issue, as well as
-in the issues page next to a distinctive balance scale icon.
+in the issues page next to a weight icon (**{weight}**).
As an added bonus, you can see the total sum of all issues on the milestone page.
-![issue page](img/issue_weight.png)
+![issue page](img/issue_weight_v13_11.png)
diff --git a/doc/user/project/issues/managing_issues.md b/doc/user/project/issues/managing_issues.md
index dafc0e6ba02..2a841400852 100644
--- a/doc/user/project/issues/managing_issues.md
+++ b/doc/user/project/issues/managing_issues.md
@@ -67,23 +67,25 @@ When you're creating a new issue, these are the fields you can fill in:
- Milestone
- Labels
-### New issue from the group-level Issue Tracker
+### New issue from the group-level issue tracker
-Go to the Group dashboard and click **Issues** in the sidebar to visit the Issue Tracker
-for all projects in your Group. Select the project you'd like to add an issue for
-using the dropdown button at the top-right of the page.
+To visit the issue tracker for all projects in your group:
-![Select project to create issue](img/select_project_from_group_level_issue_tracker.png)
+1. Go to the group dashboard.
+1. In the left sidebar, select **Issues**.
+1. In the top-right, select the **Select project to create issue** button.
+1. Select the project you'd like to create an issue for. The button now appears as **New issue in <selected project>**.
+1. Select **New issue in <selected project>**.
+
+![Select project to create issue](img/select_project_from_group_level_issue_tracker_v13_11.png)
The project you selected most recently becomes the default for your next visit.
This should save you a lot of time and clicks, if you mostly create issues for the same project.
-![Create issue from group-level issue tracker](img/create_issue_from_group_level_issue_tracker.png)
-
### New issue via Service Desk
Enable [Service Desk](../service_desk.md) for your project and offer email support.
-By doing so, when your customer sends a new email, a new issue can be created in
+Now, when your customer sends a new email, a new issue can be created in
the appropriate project and followed up from there.
### New issue via email
@@ -207,7 +209,7 @@ description, issues `#4` and `#6` are closed automatically when the MR is merged
Using `Related to` flags `#5` as a [related issue](related_issues.md),
but is not closed automatically.
-![merge request closing issue when merged](img/merge_request_closes_issue.png)
+![merge request closing issue when merged](img/merge_request_closes_issue_v13_11.png)
If the issue is in a different repository than the MR, add the full URL for the issue(s):
@@ -278,12 +280,10 @@ of your installation.
## Deleting issues
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/2982) in GitLab 8.6.
-
Users with [project owner permission](../../permissions.md) can delete an issue by
-editing it and clicking on the delete button.
+editing it and selecting **Delete issue**.
-![delete issue - button](img/delete_issue.png)
+![delete issue - button](img/delete_issue_v13_11.png)
## Promote an issue to an epic **(PREMIUM)**
diff --git a/doc/user/project/milestones/img/milestones_new_group_milestone_v13_5.png b/doc/user/project/milestones/img/milestones_new_group_milestone_v13_5.png
index a865221c5d7..ffe1328b7d3 100644
--- a/doc/user/project/milestones/img/milestones_new_group_milestone_v13_5.png
+++ b/doc/user/project/milestones/img/milestones_new_group_milestone_v13_5.png
Binary files differ
diff --git a/doc/user/project/milestones/img/milestones_project_milestone_page.png b/doc/user/project/milestones/img/milestones_project_milestone_page.png
deleted file mode 100644
index 1faaf0b3979..00000000000
--- a/doc/user/project/milestones/img/milestones_project_milestone_page.png
+++ /dev/null
Binary files differ
diff --git a/doc/user/project/milestones/img/milestones_project_milestone_page_sidebar_v13_11.png b/doc/user/project/milestones/img/milestones_project_milestone_page_sidebar_v13_11.png
new file mode 100644
index 00000000000..3bdec8e219a
--- /dev/null
+++ b/doc/user/project/milestones/img/milestones_project_milestone_page_sidebar_v13_11.png
Binary files differ
diff --git a/doc/user/project/milestones/index.md b/doc/user/project/milestones/index.md
index fe34dca4959..2399774c96d 100644
--- a/doc/user/project/milestones/index.md
+++ b/doc/user/project/milestones/index.md
@@ -38,7 +38,7 @@ You can assign **group milestones** to any issue or merge request of any project
To view the group milestone list, in a group, go to **{issues}** **Issues > Milestones**.
You can also view all milestones you have access to in the dashboard milestones list.
-To view both project milestones and group milestones you have access to, click **More > Milestones**
+To view both project milestones and group milestones you have access to, select **More > Milestones**
on the top navigation bar.
For information about project and group milestones API, see:
@@ -47,9 +47,9 @@ For information about project and group milestones API, see:
- [Group Milestones API](../../../api/group_milestones.md)
NOTE:
-If you're in a group and click **Issues > Milestones**, GitLab displays group milestones
+If you're in a group and select **Issues > Milestones**, GitLab displays group milestones
and the milestones of projects in this group.
-If you're in a project and click **Issues > Milestones**, GitLab displays only this project's milestones.
+If you're in a project and select **Issues > Milestones**, GitLab displays only this project's milestones.
## Creating milestones
@@ -58,23 +58,23 @@ A permission level of [Developer or higher](../../permissions.md) is required to
### New project milestone
-To create a **project milestone**:
+To create a project milestone:
1. In a project, go to **{issues}** **Issues > Milestones**.
-1. Click **New milestone**.
+1. Select **New milestone**.
1. Enter the title, an optional description, an optional start date, and an optional due date.
-1. Click **New milestone**.
+1. Select **New milestone**.
![New project milestone](img/milestones_new_project_milestone.png)
### New group milestone
-To create a **group milestone**:
+To create a group milestone:
1. In a group, go to **{issues}** **Issues > Milestones**.
-1. Click **New milestone**.
+1. Select **New milestone**.
1. Enter the title, an optional description, an optional start date, and an optional due date.
-1. Click **New milestone**.
+1. Select **New milestone**.
![New group milestone](img/milestones_new_group_milestone_v13_5.png)
@@ -86,10 +86,10 @@ A permission level of [Developer or higher](../../permissions.md) is required to
To edit a milestone:
1. In a project or group, go to **{issues}** **Issues > Milestones**.
-1. Click a milestone's title.
-1. Click **Edit**.
+1. Select a milestone's title.
+1. Select **Edit**.
-You can delete a milestone by clicking the **Delete** button.
+You can delete a milestone by selecting the **Delete** button.
### Promoting project milestones to group milestones
@@ -182,7 +182,7 @@ The milestone sidebar on the milestone view shows the following:
- The total time spent on all issues and merge requests assigned to the milestone.
- The total issue weight of all issues assigned to the milestone.
-![Project milestone page](img/milestones_project_milestone_page.png)
+![Project milestone page](img/milestones_project_milestone_page_sidebar_v13_11.png)
<!-- ## Troubleshooting
diff --git a/doc/user/project/requirements/img/requirements_archived_list_view_v13_1.png b/doc/user/project/requirements/img/requirements_archived_list_view_v13_1.png
index 04cb011ff89..f839a391074 100644
--- a/doc/user/project/requirements/img/requirements_archived_list_view_v13_1.png
+++ b/doc/user/project/requirements/img/requirements_archived_list_view_v13_1.png
Binary files differ
diff --git a/doc/user/todos.md b/doc/user/todos.md
index 57ab7d4d888..695532abf9f 100644
--- a/doc/user/todos.md
+++ b/doc/user/todos.md
@@ -20,11 +20,12 @@ Your *To-Do List* offers a chronological list of items waiting for your input
The To-Do List supports tracking [actions](#what-triggers-a-to-do-item) related to
the following:
-- Issues
-- Merge Requests
-- Epics **(ULTIMATE)**
+- [Issues](project/issues/index.md)
+- [Merge requests](project/merge_requests/index.md)
+- [Epics](group/epics/index.md)
+- [Designs](project/issues/design_management.md)
-![to-do screenshot showing a list of items to check on](img/todos_index.png)
+![to-do list with items to check on](img/todos_index_v13_11.png)
You can access your To-Do List by clicking the To-Do List icon (**{task-done}**)
next to the search bar in the top navigation. If the to-do item count is:
@@ -33,15 +34,13 @@ next to the search bar in the top navigation. If the to-do item count is:
- *100 or more*, the number displays as 99+. The exact number displays in the
To-Do List.
-![To Do icon](img/todos_icon.png)
-
## What triggers a to-do item
A to-do item appears on your To-Do List when:
- An issue or merge request is assigned to you.
- You're `@mentioned` in the description or comment of an issue or merge request
- (or epic **(ULTIMATE)**).
+ (or epic).
- You are `@mentioned` in a comment on a:
- Commit
- Design
@@ -54,7 +53,7 @@ A to-do item appears on your To-Do List when:
- [In GitLab 13.2](https://gitlab.com/gitlab-org/gitlab/-/issues/12136) and later, a
merge request is removed from a
[merge train](../ci/merge_request_pipelines/pipelines_for_merged_results/merge_trains/index.md),
- and you're the user that added it. **(PREMIUM)**
+ and you're the user that added it.
When several trigger actions occur for the same user on the same object (for
example, an issue), GitLab displays only the first action as a single to do
@@ -93,18 +92,18 @@ for filtering purposes; otherwise, they appear as normal.
### Manually creating a to-do item
-You can also add the following to your To-Do List by clicking the **Add a to do** button on an:
+You can also add the following to your To-Do List by clicking the **Add a to do** button on:
-- [Issue](project/issues/index.md)
-- [Merge Request](project/merge_requests/index.md)
-- [Epic](group/epics/index.md) **(ULTIMATE)**
-- [Design](project/issues/design_management.md)
+- [Issues](project/issues/index.md)
+- [Merge requests](project/merge_requests/index.md)
+- [Epics](group/epics/index.md)
+- [Designs](project/issues/design_management.md)
![Adding a to-do item from the issuable sidebar](img/todos_add_todo_sidebar.png)
## Marking a to-do item as done
-Any action to an issue or merge request (or epic **(PREMIUM)**) marks its
+Any action to an issue, merge request, or epic marks its
corresponding to-do item as done.
Actions that dismiss to-do items include:
@@ -119,8 +118,8 @@ action. If you close the issue or merge request, your to-do item is marked as
done.
To prevent other users from closing issues without you being notified, if
-someone else closes, merges, or takes action on an issue or merge request (or
-epic **(ULTIMATE)**), your to-do item remains pending.
+someone else closes, merges, or takes action on an issue, merge request, or
+epic, your to-do item remains pending.
There's just one to-do item for each of these, so mentioning a user many times
in an issue only triggers one to-do item.
@@ -132,7 +131,7 @@ your To-Do List.
![A to do in the To-Do List](img/todos_todo_list_item.png)
You can also mark a to-do item as done by clicking the **Mark as done** button
-in the sidebar of an issue or merge request (or epic **(ULTIMATE)**).
+in the sidebar of an issue, merge request, or epic.
![Mark as done from the issuable sidebar](img/todos_mark_done_sidebar.png)
@@ -148,7 +147,7 @@ You can use the following types of filters with your To-Do List:
| Project | Filter by project. |
| Group | Filter by group. |
| Author | Filter by the author that triggered the to do. |
-| Type | Filter by issue, merge request, design, or epic. **(ULTIMATE)** |
+| Type | Filter by issue, merge request, design, or epic. |
| Action | Filter by the action that triggered the to do. |
You can also filter by more than one of these at the same time. The previously