diff --git a/doc/user/project/issues/img/create_new_merge_request.png b/doc/user/project/issues/img/create_new_merge_request.png deleted file mode 100644 index d4bfb6fa4630d10a83d341a6a7944193f93414ea..0000000000000000000000000000000000000000 Binary files a/doc/user/project/issues/img/create_new_merge_request.png and /dev/null differ diff --git a/doc/user/project/issues/img/issues_main_view.png b/doc/user/project/issues/img/issues_main_view.png old mode 100755 new mode 100644 index e9a94a3aab07aacfb141685eeae88f20b0c037e9..4faa42e40ee3e6e781218a5efbe74709d4c83403 Binary files a/doc/user/project/issues/img/issues_main_view.png and b/doc/user/project/issues/img/issues_main_view.png differ diff --git a/doc/user/project/issues/img/issues_main_view_numbered.jpg b/doc/user/project/issues/img/issues_main_view_numbered.jpg new file mode 100644 index 0000000000000000000000000000000000000000..4b5d7fba4599f116af9b6d60060a7e438cfc2876 Binary files /dev/null and b/doc/user/project/issues/img/issues_main_view_numbered.jpg differ diff --git a/doc/user/project/issues/img/issues_main_view_numbered.png b/doc/user/project/issues/img/issues_main_view_numbered.png deleted file mode 100755 index 9cff61d70413d3d92761326ada563d14790fe4e0..0000000000000000000000000000000000000000 Binary files a/doc/user/project/issues/img/issues_main_view_numbered.png and /dev/null differ diff --git a/doc/user/project/issues/index.md b/doc/user/project/issues/index.md index c726da172590abe38bb2429ba2ed65d39d7a937b..9598cb801bede0065f7983ac98f21fc36413529d 100644 --- a/doc/user/project/issues/index.md +++ b/doc/user/project/issues/index.md @@ -49,6 +49,10 @@ Read through the [documentation on creating issues](create_new_issue.md). Read through the distinct ways to [close issues](closing_issues.md) on GitLab. +## Create a merge request from an issue + +Learn more about it on the [GitLab Issues Functionalities documentation](issues_functionalities.md#18-new-merge-request). + ## Search for an issue Learn how to [find an issue](../../search/index.md) by searching for and filtering them. diff --git a/doc/user/project/issues/issues_functionalities.md b/doc/user/project/issues/issues_functionalities.md index e1923e910421ca75644bd1ebd077c335b15c2ca4..ba843201e1a9c6f89b8b0574dceea0c430ed8832 100644 --- a/doc/user/project/issues/issues_functionalities.md +++ b/doc/user/project/issues/issues_functionalities.md @@ -6,7 +6,7 @@ Please read through the [GitLab Issue Documentation](index.md) for an overview o The image bellow illustrates how an issue looks like: -![Issue view](img/issues_main_view_numbered.png) +![Issue view](img/issues_main_view_numbered.jpg) You can find all the information on that issue on one screen. @@ -41,6 +41,21 @@ it's reassigned to someone else to take it from there. 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 (EES/EEP) + +Issue Weights are only available in [GitLab Enterprise Edition](https://about.gitlab.com/gitlab-ee/). + +Often multiple people likely work on the same issue together, +which can especially be difficult to track in large teams +where there is shared ownership of an issue. + +In GitLab Enterprise Edition, you can also select multiple assignees +to an issue. + +> **Note:** +Multiple Assignees was [introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/1904) +in [GitLab Enterprise Edition 9.2](https://about.gitlab.com/2017/05/22/gitlab-9-2-released/#multiple-assignees-for-issues). + #### 4. Milestone - Select a [milestone](../milestones/index.md) to attribute that issue to. @@ -153,14 +168,9 @@ Once you wrote your comment, you can either: - Click "Start discussion": start a thread within that issue's thread to discuss specific points. - Click "Comment and close issue": post your comment and close that issue in one click. -#### 18. New branch - -- [New branch](../repository/web_editor.md#create-a-new-branch-from-an-issue): -create a new branch, followed by a new merge request which will automatically close that -issue as soon as that merge request is merged. - -#### 19. New merge request - -- Create a new merge request (with source branch) in one action. Optionally just create a new branch, as explained above. +#### 18. New Merge Request -![Create new merge request](img/create_new_merge_request.png) +- Create a new merge request (with a new source branch named after the issue) in one action. +The merge request will automatically close that issue as soon as merged. +- Optionally, you can just create a [new branch](../repository/web_editor.md#create-a-new-branch-from-an-issue) +named after that issue.