Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
1e7cbe0b
Commit
1e7cbe0b
authored
Aug 16, 2016
by
Connor Shea
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add documentation for discussion resolution.
parent
523e1b11
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
40 additions
and
8 deletions
+40
-8
doc/user/project/merge_requests/img/discussion_view.png
doc/user/project/merge_requests/img/discussion_view.png
+0
-0
doc/user/project/merge_requests/img/discussions_resolved.png
doc/user/project/merge_requests/img/discussions_resolved.png
+0
-0
doc/user/project/merge_requests/img/resolve_comment_button.png
...ser/project/merge_requests/img/resolve_comment_button.png
+0
-0
doc/user/project/merge_requests/img/resolve_discussion_button.png
.../project/merge_requests/img/resolve_discussion_button.png
+0
-0
doc/user/project/merge_requests/merge_request_discussion_resolution.md
...ect/merge_requests/merge_request_discussion_resolution.md
+40
-0
doc/user/project/merge_requests/resolve_inline_comments.md
doc/user/project/merge_requests/resolve_inline_comments.md
+0
-8
No files found.
doc/user/project/merge_requests/img/discussion_view.png
0 → 100644
View file @
1e7cbe0b
286 KB
doc/user/project/merge_requests/img/discussions_resolved.png
0 → 100644
View file @
1e7cbe0b
12.5 KB
doc/user/project/merge_requests/img/resolve_comment_button.png
0 → 100644
View file @
1e7cbe0b
13.7 KB
doc/user/project/merge_requests/img/resolve_discussion_button.png
0 → 100644
View file @
1e7cbe0b
18 KB
doc/user/project/merge_requests/merge_request_discussion_resolution.md
0 → 100644
View file @
1e7cbe0b
# Merge Request discussion resolution
> [Introduced][ce-5022] in GitLab 8.11.
Discussion resolution helps keep track of progress during code review.
Resolving comments prevents you from forgetting to address feedback and lets you
hide discussions that are no longer relevant.
![
"A discussion between two people on a piece of code"
][
discussion-view
]
Comments and discussions can be resolved by anyone with at least Developer
access to the project, as well as by the author of the merge request.
## Marking a comment or discussion as resolved
You can mark a discussion as resolved by clicking the "Resolve discussion"
button at the bottom of the discussion.
![
"Resolve discussion" button
][
resolve-discussion-button
]
Alternatively, you can mark each comment as resolved individually.
![
"Resolve comment" button
][
resolve-comment-button
]
## Jumping between unresolved discussions
When a merge request has a large number of comments it can be difficult to track
what remains unresolved. You can jump between unresolved discussions with the
Jump button next to the Reply field on a discussion.
You can also jump to the first unresolved discussion from the button next to the
resolved discussions tracker.
![
"3/4 discussions resolved"
][
discussions-resolved
]
[
ce-5022
]:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022
[
resolve-discussion-button
]:
img/resolve_discussion_button.png
[
resolve-comment-button
]:
img/resolve_comment_button.png
[
discussion-view
]:
img/discussion_view.png
[
discussions-resolved
]:
img/discussions_resolved.png
doc/user/project/merge_requests/resolve_inline_comments.md
deleted
100644 → 0
View file @
523e1b11
# Resolve inline comments
>**Note:** [Introduced][ce-5022] in GitLab 8.11.
## Overview
[
ce-5022
]:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment