Commit 4b9bdf31 authored by Marcel Amirault's avatar Marcel Amirault Committed by Achilleas Pipinellis

Docs: (EE Port) Merge EE doc/​workflow to CE

parent 897961f6
...@@ -13,15 +13,15 @@ comments: false ...@@ -13,15 +13,15 @@ comments: false
- [Groups](../user/group/index.md) - [Groups](../user/group/index.md)
- Issues - The GitLab Issue Tracker is an advanced and complete tool for - Issues - The GitLab Issue Tracker is an advanced and complete tool for
tracking the evolution of a new idea or the process of solving a problem. tracking the evolution of a new idea or the process of solving a problem.
- (EE) [Exporting Issues](../user/project/issues/csv_export.md) Export issues as a CSV, emailed as an attachment. - [Exporting Issues](https://docs.gitlab.com/ee/user/project/issues/csv_export.html) **[STARTER]** Export issues as a CSV, emailed as an attachment.
- [Confidential issues](../user/project/issues/confidential_issues.md) - [Confidential issues](../user/project/issues/confidential_issues.md)
- [Due date for issues](../user/project/issues/due_dates.md) - [Due date for issues](../user/project/issues/due_dates.md)
- [Issue Board](../user/project/issue_board.md) - [Issue Board](../user/project/issue_board.md)
- [Keyboard shortcuts](shortcuts.md) - [Keyboard shortcuts](shortcuts.md)
- [File finder](file_finder.md) - [File finder](file_finder.md)
- (EE) [File lock](../user/project/file_lock.md) - [File lock](https://docs.gitlab.com/ee/user/project/file_lock.html) **[PREMIUM]**
- [Labels](../user/project/labels.md) - [Labels](../user/project/labels.md)
- (EE) [Issue weight](issue_weight.md) - [Issue weight](https://docs.gitlab.com/ee/workflow/issue_weight.html) **[STARTER]**
- [Notification emails](notifications.md) - [Notification emails](notifications.md)
- [Projects](../user/project/index.md) - [Projects](../user/project/index.md)
- [Project forking workflow](forking_workflow.md) - [Project forking workflow](forking_workflow.md)
...@@ -44,9 +44,9 @@ comments: false ...@@ -44,9 +44,9 @@ comments: false
- [Merge requests versions](../user/project/merge_requests/versions.md) - [Merge requests versions](../user/project/merge_requests/versions.md)
- ["Work In Progress" merge requests](../user/project/merge_requests/work_in_progress_merge_requests.md) - ["Work In Progress" merge requests](../user/project/merge_requests/work_in_progress_merge_requests.md)
- [Fast-forward merge requests](../user/project/merge_requests/fast_forward_merge.md) - [Fast-forward merge requests](../user/project/merge_requests/fast_forward_merge.md)
- [Merge request approvals](../user/project/merge_requests/merge_request_approvals.md) **[STARTER]** - [Merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html) **[STARTER]**
- [Repository mirroring](repository_mirroring.md) **[STARTER]** - [Repository mirroring](repository_mirroring.md) **[STARTER]**
- [Service Desk](../user/project/service_desk.md) **[PREMIUM]** - [Service Desk](https://docs.gitlab.com/ee/user/project/service_desk.html) **[PREMIUM]**
- [Manage large binaries with Git LFS](lfs/manage_large_binaries_with_git_lfs.md) - [Manage large binaries with Git LFS](lfs/manage_large_binaries_with_git_lfs.md)
- [Importing from SVN, GitHub, Bitbucket, etc](importing/README.md) - [Importing from SVN, GitHub, Bitbucket, etc](importing/README.md)
- [Todos](todos.md) - [Todos](todos.md)
......
--- ---
redirect_to: '../user/project/merge_requests/merge_request_approvals.md' redirect_to: 'https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html'
--- ---
This document was moved to [user/project/merge_requests/merge_request_approvals](../user/project/merge_requests/merge_request_approvals.md). This document was moved to [user/project/merge_requests/merge_request_approvals](https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html).
...@@ -80,36 +80,36 @@ In most of the below cases, the notification will be sent to: ...@@ -80,36 +80,36 @@ In most of the below cases, the notification will be sent to:
- Participants: - Participants:
- the author and assignee of the issue/merge request - the author and assignee of the issue/merge request
- authors of comments on the issue/merge request - authors of comments on the issue/merge request
- anyone mentioned by `@username` in the issue/epic/merge request title or description - anyone mentioned by `@username` in the title or description of the issue, merge request or epic **[ULTIMATE]**
- anyone mentioned by `@username` in any of the comments on the issue/epic/merge request - anyone with notification level "Participating" or higher that is mentioned by `@username`
...with notification level "Participating" or higher in any of the comments on the issue, merge request, or epic **[ULTIMATE]**
- Watchers: users with notification level "Watch" - Watchers: users with notification level "Watch"
- Subscribers: anyone who manually subscribed to the issue/epic/merge request - Subscribers: anyone who manually subscribed to the issue, merge request, or epic **[ULTIMATE]**
- Custom: Users with notification level "custom" who turned on notifications for any of the events present in the table below - Custom: Users with notification level "custom" who turned on notifications for any of the events present in the table below
| Event | Sent to | | Event | Sent to |
|------------------------|---------| |------------------------|---------|
| New issue | | | New issue | |
| Close issue | | | Close issue | |
| Reassign issue | The above, plus the old assignee | | Reassign issue | The above, plus the old assignee |
| Reopen issue | | | Reopen issue | |
| Due issue | Participants and Custom notification level with this event selected | | Due issue | Participants and Custom notification level with this event selected |
| Change milestone issue | Subscribers, participants mentioned, and Custom notification level with this event selected | | Change milestone issue | Subscribers, participants mentioned, and Custom notification level with this event selected |
| Remove milestone issue | Subscribers, participants mentioned, and Custom notification level with this event selected | | Remove milestone issue | Subscribers, participants mentioned, and Custom notification level with this event selected |
| New merge request | | | New merge request | |
| Push to merge request | Participants and Custom notification level with this event selected | | Push to merge request | Participants and Custom notification level with this event selected |
| Reassign merge request | The above, plus the old assignee | | Reassign merge request | The above, plus the old assignee |
| Close merge request | | | Close merge request | |
| Reopen merge request | | | Reopen merge request | |
| Merge merge request | | | Merge merge request | |
| Change milestone merge request | Subscribers, participants mentioned, and Custom notification level with this event selected | | Change milestone merge request | Subscribers, participants mentioned, and Custom notification level with this event selected |
| Remove milestone merge request | Subscribers, participants mentioned, and Custom notification level with this event selected | | Remove milestone merge request | Subscribers, participants mentioned, and Custom notification level with this event selected |
| New comment | The above, plus anyone mentioned by `@username` in the comment, with notification level "Mention" or higher | | New comment | The above, plus anyone mentioned by `@username` in the comment, with notification level "Mention" or higher |
| Failed pipeline | The author of the pipeline | | Failed pipeline | The author of the pipeline |
| Successful pipeline | The author of the pipeline, if they have the custom notification setting for successful pipelines set | | Successful pipeline | The author of the pipeline, if they have the custom notification setting for successful pipelines set |
| New epic | | | New epic **[ULTIMATE]** | |
| Close epic | | | Close epic **[ULTIMATE]** | |
| Reopen epic | | | Reopen epic **[ULTIMATE]** | |
In addition, if the title or description of an Issue or Merge Request is In addition, if the title or description of an Issue or Merge Request is
changed, notifications will be sent to any **new** mentions by `@username` as changed, notifications will be sent to any **new** mentions by `@username` as
......
...@@ -85,7 +85,7 @@ You can see GitLab's keyboard shortcuts by using 'shift + ?' ...@@ -85,7 +85,7 @@ You can see GitLab's keyboard shortcuts by using 'shift + ?'
| <kbd>]</kbd> or <kbd>j</kbd> | Move to next file | | <kbd>]</kbd> or <kbd>j</kbd> | Move to next file |
| <kbd>[</kbd> or <kbd>k</kbd> | Move to previous file | | <kbd>[</kbd> or <kbd>k</kbd> | Move to previous file |
## Epics ## Epics **[ULTIMATE]**
| Keyboard Shortcut | Description | | Keyboard Shortcut | Description |
| ----------------- | ----------- | | ----------------- | ----------- |
......
...@@ -25,9 +25,8 @@ will still be shown in the body of the _To do_ tab. ...@@ -25,9 +25,8 @@ will still be shown in the body of the _To do_ tab.
A Todo appears in your Todos dashboard when: A Todo appears in your Todos dashboard when:
- an issue or merge request is assigned to you, - an issue or merge request is assigned to you
- you are `@mentioned` in an issue, merge request or epic, be it the description of - you are `@mentioned` in the description or in a comment of an issue, merge request, or epic **[ULTIMATE]**
the issue/merge request/epic or in a comment,
- you are `@mentioned` in a comment on a commit, - you are `@mentioned` in a comment on a commit,
- a job in the CI pipeline running for your merge request failed, but this - a job in the CI pipeline running for your merge request failed, but this
job is not allowed to fail. job is not allowed to fail.
...@@ -64,13 +63,13 @@ for filtering; otherwise, they appear as normal. ...@@ -64,13 +63,13 @@ for filtering; otherwise, they appear as normal.
### Manually creating a Todo ### Manually creating a Todo
You can also add an issue, merge request or epic to your Todos dashboard by clicking You can also add an issue, merge request or epic to your Todos dashboard by clicking
the "Add todo" button in the issue, merge request or epic sidebar. the "Add todo" button in the sidebar of the issue, merge request, or epic **[ULTIMATE]**.
![Adding a Todo from the issuable sidebar](img/todos_add_todo_sidebar.png) ![Adding a Todo from the issuable sidebar](img/todos_add_todo_sidebar.png)
## Marking a Todo as done ## Marking a Todo as done
Any action to the corresponding issue, merge request or epic will mark your Todo as Any action to the corresponding issue, merge request or epic **[ULTIMATE]** will mark your Todo as
**Done**. Actions that dismiss Todos include: **Done**. Actions that dismiss Todos include:
- changing the assignee - changing the assignee
...@@ -114,7 +113,7 @@ There are four kinds of filters you can use on your Todos dashboard. ...@@ -114,7 +113,7 @@ There are four kinds of filters you can use on your Todos dashboard.
| Project | Filter by project | | Project | Filter by project |
| Group | Filter by group | | Group | Filter by group |
| Author | Filter by the author that triggered the Todo | | Author | Filter by the author that triggered the Todo |
| Type | Filter by issue, merge request or epic | | Type | Filter by issue, merge request, or epic **[ULTIMATE]** |
| Action | Filter by the action that triggered the Todo | | Action | Filter by the action that triggered the Todo |
You can also filter by more than one of these at the same time. The possible Actions are `Any Action`, `Assigned`, `Mentioned`, `Added`, `Pipelines`, and `Directly Addressed`, [as described above](#what-triggers-a-todo). You can also filter by more than one of these at the same time. The possible Actions are `Any Action`, `Assigned`, `Mentioned`, `Added`, `Pipelines`, and `Directly Addressed`, [as described above](#what-triggers-a-todo).
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment