diff options
| author | Evan Read <eread@gitlab.com> | 2018-11-16 07:19:24 +0300 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2018-11-16 07:19:24 +0300 |
| commit | fad88129f4aacda44b011a2404b0a53049d6212d (patch) | |
| tree | a6e78350a02e7617941488d7076607dddf70d572 | |
| parent | 59e2da329d50a9ba8710fd0bf9fa2f39d61f0c46 (diff) | |
| parent | 19a79483dce0fbbbdeebb4f7bdb7d334df480996 (diff) | |
Merge branch 'osw-comment-on-any-diff-line-docs' into 'master'
Add docs for commenting in any line of MR diff files
See merge request gitlab-org/gitlab-ce!22878
| -rw-r--r-- | doc/user/project/merge_requests/img/comment-on-any-diff-line.png | bin | 0 -> 177323 bytes | |||
| -rw-r--r-- | doc/user/project/merge_requests/index.md | 9 |
2 files changed, 9 insertions, 0 deletions
diff --git a/doc/user/project/merge_requests/img/comment-on-any-diff-line.png b/doc/user/project/merge_requests/img/comment-on-any-diff-line.png Binary files differnew file mode 100644 index 00000000000..856ede41527 --- /dev/null +++ b/doc/user/project/merge_requests/img/comment-on-any-diff-line.png diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md index 6de2ab07fc4..f2f2497f0be 100644 --- a/doc/user/project/merge_requests/index.md +++ b/doc/user/project/merge_requests/index.md @@ -141,6 +141,15 @@ you hide discussions that are no longer relevant. [Read more about resolving discussion comments in merge requests reviews.](../../discussions/index.md) +## Commenting on any file line in merge requests + +> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/13950) in GitLab 11.5. + +GitLab provides a way of leaving comments in any part of the file being changed +in a Merge Request. To do so, click the **...** button in the gutter of the Merge Request diff UI to expand the diff lines and leave a comment, just as you would for a changed line. + + + ## Resolve conflicts When a merge request has conflicts, GitLab may provide the option to resolve |
