From e84787ae085e184c893f7da40ca29a0c5fecf810 Mon Sep 17 00:00:00 2001 From: Achilleas Pipinellis Date: Fri, 21 Apr 2017 19:35:23 +0200 Subject: Refactor Discussions docs - Move to dicsussions/index.md - Bring back previous path with a link to new location - Reorder sections --- doc/README.md | 2 +- doc/user/discussions.md | 139 ------------------- .../img/btn_new_issue_for_all_discussions.png | Bin 0 -> 29007 bytes doc/user/discussions/img/comment_type_toggle.gif | Bin 0 -> 70796 bytes doc/user/discussions/img/discussion_comment.png | Bin 0 -> 57189 bytes doc/user/discussions/img/discussion_view.png | Bin 0 -> 73821 bytes doc/user/discussions/img/discussions_resolved.png | Bin 0 -> 4152 bytes .../discussions/img/new_issue_for_discussion.png | Bin 0 -> 39563 bytes ...allow_merge_if_all_discussions_are_resolved.png | Bin 0 -> 17888 bytes ...w_merge_if_all_discussions_are_resolved_msg.png | Bin 0 -> 4962 bytes .../img/preview_issue_for_discussion.png | Bin 0 -> 82412 bytes .../img/preview_issue_for_discussions.png | Bin 0 -> 143871 bytes .../discussions/img/resolve_comment_button.png | Bin 0 -> 4722 bytes .../discussions/img/resolve_discussion_button.png | Bin 0 -> 4683 bytes .../img/resolve_discussion_issue_notice.png | Bin 0 -> 10307 bytes .../img/resolve_discussion_open_issue.png | Bin 0 -> 20967 bytes doc/user/discussions/index.md | 150 +++++++++++++++++++++ doc/user/img/btn_new_issue_for_all_discussions.png | Bin 29007 -> 0 bytes doc/user/img/comment_type_toggle.gif | Bin 70796 -> 0 bytes doc/user/img/discussion_comment.png | Bin 57189 -> 0 bytes doc/user/img/discussion_view.png | Bin 73821 -> 0 bytes doc/user/img/discussions_resolved.png | Bin 4152 -> 0 bytes doc/user/img/new_issue_for_discussion.png | Bin 39563 -> 0 bytes ...allow_merge_if_all_discussions_are_resolved.png | Bin 17888 -> 0 bytes ...w_merge_if_all_discussions_are_resolved_msg.png | Bin 4962 -> 0 bytes doc/user/img/preview_issue_for_discussion.png | Bin 82412 -> 0 bytes doc/user/img/preview_issue_for_discussions.png | Bin 143871 -> 0 bytes doc/user/img/resolve_comment_button.png | Bin 4722 -> 0 bytes doc/user/img/resolve_discussion_button.png | Bin 4683 -> 0 bytes doc/user/img/resolve_discussion_issue_notice.png | Bin 10307 -> 0 bytes doc/user/img/resolve_discussion_open_issue.png | Bin 20967 -> 0 bytes doc/user/project/merge_requests/index.md | 2 +- .../merge_request_discussion_resolution.md | 1 + doc/workflow/README.md | 2 +- 34 files changed, 154 insertions(+), 142 deletions(-) delete mode 100644 doc/user/discussions.md create mode 100644 doc/user/discussions/img/btn_new_issue_for_all_discussions.png create mode 100644 doc/user/discussions/img/comment_type_toggle.gif create mode 100644 doc/user/discussions/img/discussion_comment.png create mode 100644 doc/user/discussions/img/discussion_view.png create mode 100644 doc/user/discussions/img/discussions_resolved.png create mode 100644 doc/user/discussions/img/new_issue_for_discussion.png create mode 100644 doc/user/discussions/img/only_allow_merge_if_all_discussions_are_resolved.png create mode 100644 doc/user/discussions/img/only_allow_merge_if_all_discussions_are_resolved_msg.png create mode 100644 doc/user/discussions/img/preview_issue_for_discussion.png create mode 100644 doc/user/discussions/img/preview_issue_for_discussions.png create mode 100644 doc/user/discussions/img/resolve_comment_button.png create mode 100644 doc/user/discussions/img/resolve_discussion_button.png create mode 100644 doc/user/discussions/img/resolve_discussion_issue_notice.png create mode 100644 doc/user/discussions/img/resolve_discussion_open_issue.png create mode 100644 doc/user/discussions/index.md delete mode 100644 doc/user/img/btn_new_issue_for_all_discussions.png delete mode 100644 doc/user/img/comment_type_toggle.gif delete mode 100644 doc/user/img/discussion_comment.png delete mode 100644 doc/user/img/discussion_view.png delete mode 100644 doc/user/img/discussions_resolved.png delete mode 100644 doc/user/img/new_issue_for_discussion.png delete mode 100644 doc/user/img/only_allow_merge_if_all_discussions_are_resolved.png delete mode 100644 doc/user/img/only_allow_merge_if_all_discussions_are_resolved_msg.png delete mode 100644 doc/user/img/preview_issue_for_discussion.png delete mode 100644 doc/user/img/preview_issue_for_discussions.png delete mode 100644 doc/user/img/resolve_comment_button.png delete mode 100644 doc/user/img/resolve_discussion_button.png delete mode 100644 doc/user/img/resolve_discussion_issue_notice.png delete mode 100644 doc/user/img/resolve_discussion_open_issue.png create mode 100644 doc/user/project/merge_requests/merge_request_discussion_resolution.md (limited to 'doc') diff --git a/doc/README.md b/doc/README.md index 67deda1eaeb..fb393aa09a1 100644 --- a/doc/README.md +++ b/doc/README.md @@ -15,6 +15,7 @@ All technical content published by GitLab lives in the documentation, including: - [API](api/README.md) Automate GitLab via a simple and powerful API. - [CI/CD](ci/README.md) GitLab Continuous Integration (CI) and Continuous Delivery (CD) getting started, `.gitlab-ci.yml` options, and examples. - [Container Registry](user/project/container_registry.md) Learn how to use GitLab Container Registry. +- [Discussions](user/discussions/index.md) Threads, comments, and resolvable discussions in issues, commits, and merge requests. - [Git Attributes](user/project/git_attributes.md) Managing Git attributes using a `.gitattributes` file. - [Git cheatsheet](https://gitlab.com/gitlab-com/marketing/raw/master/design/print/git-cheatsheet/print-pdf/git-cheatsheet.pdf) Download a PDF describing the most used Git operations. - [GitLab as OAuth2 authentication service provider](integration/oauth_provider.md). It allows you to login to other applications from GitLab. @@ -23,7 +24,6 @@ All technical content published by GitLab lives in the documentation, including: - [Importing and exporting projects between instances](user/project/settings/import_export.md). - [Importing to GitLab](workflow/importing/README.md) Import your projects from GitHub, Bitbucket, GitLab.com, FogBugz and SVN into GitLab. - [Markdown](user/markdown.md) GitLab's advanced formatting system. -- [Discussions](user/discussions.md) Get the most out of your conversations. - [Migrating from SVN](workflow/importing/migrating_from_svn.md) Convert a SVN repository to Git and GitLab. - [Permissions](user/permissions.md) Learn what each role in a project (external/guest/reporter/developer/master/owner) can do. - [Profile Settings](profile/README.md) diff --git a/doc/user/discussions.md b/doc/user/discussions.md deleted file mode 100644 index 2276bf1971e..00000000000 --- a/doc/user/discussions.md +++ /dev/null @@ -1,139 +0,0 @@ -# Discussions - -The ability to contribute conversationally is offered throughout GitLab. - -## Standard Comments - -Standard comments can be added to issues, merge requests, snippets, commits and commit diffs. - -## Resolvable Discussions - -Resolvable discussions can be added to merge request diffs, merge requests, issues, commits and snippets. - -Discussion resolution helps keep track of progress during planning or 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 or 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] - -### Moving a single discussion to a new issue - -> [Introduced][ce-8266] in GitLab 9.1 - -To create a new issue for a single discussion, you can use the **Resolve this -discussion in a new issue** button. - -![Create issue for discussion](img/new_issue_for_discussion.png) - -This will direct you to a new issue prefilled with the content of the -discussion, similar to the issues created for delegating multiple -discussions at once. - -![New issue for a single discussion](img/preview_issue_for_discussion.png) - -Saving the issue will mark the discussion as resolved and add a note -to the discussion referencing the new issue. - -[ce-5022]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022 -[ce-7125]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7125 -[ce-7180]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7180 -[ce-8266]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8266 -[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 - -## Merge request diffs - -> [Introduced][ce-5022] in GitLab 8.11. - -Discussions can be started on merge request diffs to keep track of progress during code review. - -!["A discussion between two people on a piece of code"][discussion-view] - -### 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] - -### Only allow merge requests to be merged if all discussions are resolved - -> [Introduced][ce-7125] in GitLab 8.14. - -You can prevent merge requests from being merged until all discussions are -resolved. - -Navigate to your project's settings page, select the -**Only allow merge requests to be merged if all discussions are resolved** check -box and hit **Save** for the changes to take effect. - -![Only allow merge if all the discussions are resolved settings](img/only_allow_merge_if_all_discussions_are_resolved.png) - -From now on, you will not be able to merge from the UI until all discussions -are resolved. - -![Only allow merge if all the discussions are resolved message](img/only_allow_merge_if_all_discussions_are_resolved_msg.png) - -### Move all unresolved discussions in a merge request to an issue - -> [Introduced][ce-8266] in GitLab 9.1 - -To continue all open discussions in a merge request, click the button **Resolve -all discussions in new issue** - -![Open new issue for all unresolved discussions](img/btn_new_issue_for_all_discussions.png) - -Alternatively, when your project only accepts merge requests when all discussions -are resolved, there will be an **open an issue to resolve them later** link in -the merge request-widget. - -![Link in merge request widget](img/resolve_discussion_open_issue.png) - -This will prepare an issue with content referring to the merge request and -discussions. - -![Issue mentioning discussions in a merge request](img/preview_issue_for_discussions.png) - -Hitting **Submit issue** will cause all discussions to be marked as resolved and -add a note referring to the newly created issue. - -![Mark discussions as resolved notice](img/resolve_discussion_issue_notice.png) - -You can now proceed to merge the merge request from the UI. - - -## Issues, commits, snippets and merge requests - -> [Introduced][ce-7527] in GitLab 9.1. - -Discussions can be started on issues, commits, snippets and merge requests. - -Resolvable discussions can be added to merge request diffs, but discussions can also be added without a diff. - -To start a discussion, you can click on the "Comment" button toggle dropdown, select "Start discussion" and click "Start discussion" when you're ready to post the comment. - -![Comment type toggle](img/comment_type_toggle.gif) - -This will post a comment with a single thread to allow you to discuss specific comments in greater detail. - -![Discussion comment](img/discussion_comment.png) diff --git a/doc/user/discussions/img/btn_new_issue_for_all_discussions.png b/doc/user/discussions/img/btn_new_issue_for_all_discussions.png new file mode 100644 index 00000000000..b15447ec290 Binary files /dev/null and b/doc/user/discussions/img/btn_new_issue_for_all_discussions.png differ diff --git a/doc/user/discussions/img/comment_type_toggle.gif b/doc/user/discussions/img/comment_type_toggle.gif new file mode 100644 index 00000000000..b73c197b97f Binary files /dev/null and b/doc/user/discussions/img/comment_type_toggle.gif differ diff --git a/doc/user/discussions/img/discussion_comment.png b/doc/user/discussions/img/discussion_comment.png new file mode 100644 index 00000000000..8f66d138922 Binary files /dev/null and b/doc/user/discussions/img/discussion_comment.png differ diff --git a/doc/user/discussions/img/discussion_view.png b/doc/user/discussions/img/discussion_view.png new file mode 100644 index 00000000000..2ee1db2eab3 Binary files /dev/null and b/doc/user/discussions/img/discussion_view.png differ diff --git a/doc/user/discussions/img/discussions_resolved.png b/doc/user/discussions/img/discussions_resolved.png new file mode 100644 index 00000000000..3fd496f6da5 Binary files /dev/null and b/doc/user/discussions/img/discussions_resolved.png differ diff --git a/doc/user/discussions/img/new_issue_for_discussion.png b/doc/user/discussions/img/new_issue_for_discussion.png new file mode 100644 index 00000000000..93c9dad8921 Binary files /dev/null and b/doc/user/discussions/img/new_issue_for_discussion.png differ diff --git a/doc/user/discussions/img/only_allow_merge_if_all_discussions_are_resolved.png b/doc/user/discussions/img/only_allow_merge_if_all_discussions_are_resolved.png new file mode 100644 index 00000000000..928c7d33898 Binary files /dev/null and b/doc/user/discussions/img/only_allow_merge_if_all_discussions_are_resolved.png differ diff --git a/doc/user/discussions/img/only_allow_merge_if_all_discussions_are_resolved_msg.png b/doc/user/discussions/img/only_allow_merge_if_all_discussions_are_resolved_msg.png new file mode 100644 index 00000000000..bcdc0250d7c Binary files /dev/null and b/doc/user/discussions/img/only_allow_merge_if_all_discussions_are_resolved_msg.png differ diff --git a/doc/user/discussions/img/preview_issue_for_discussion.png b/doc/user/discussions/img/preview_issue_for_discussion.png new file mode 100644 index 00000000000..2ee0653b2ba Binary files /dev/null and b/doc/user/discussions/img/preview_issue_for_discussion.png differ diff --git a/doc/user/discussions/img/preview_issue_for_discussions.png b/doc/user/discussions/img/preview_issue_for_discussions.png new file mode 100644 index 00000000000..3fe0a666678 Binary files /dev/null and b/doc/user/discussions/img/preview_issue_for_discussions.png differ diff --git a/doc/user/discussions/img/resolve_comment_button.png b/doc/user/discussions/img/resolve_comment_button.png new file mode 100644 index 00000000000..70340108874 Binary files /dev/null and b/doc/user/discussions/img/resolve_comment_button.png differ diff --git a/doc/user/discussions/img/resolve_discussion_button.png b/doc/user/discussions/img/resolve_discussion_button.png new file mode 100644 index 00000000000..ab454f661e0 Binary files /dev/null and b/doc/user/discussions/img/resolve_discussion_button.png differ diff --git a/doc/user/discussions/img/resolve_discussion_issue_notice.png b/doc/user/discussions/img/resolve_discussion_issue_notice.png new file mode 100644 index 00000000000..e0ee6a39ffd Binary files /dev/null and b/doc/user/discussions/img/resolve_discussion_issue_notice.png differ diff --git a/doc/user/discussions/img/resolve_discussion_open_issue.png b/doc/user/discussions/img/resolve_discussion_open_issue.png new file mode 100644 index 00000000000..98d63278326 Binary files /dev/null and b/doc/user/discussions/img/resolve_discussion_open_issue.png differ diff --git a/doc/user/discussions/index.md b/doc/user/discussions/index.md new file mode 100644 index 00000000000..c5123c06ce0 --- /dev/null +++ b/doc/user/discussions/index.md @@ -0,0 +1,150 @@ +# Discussions + +The ability to contribute conversationally is offered throughout GitLab. + +You can leave a comment in the following places: + +- issues +- merge requests +- snippets +- commits +- commit diffs + +The comment area supports [Markdown] and [slash commands]. One can edit their +own comment at any time, and anyone with [Master access level][permissions] or +higher can also a comment made by someone else. + +Apart from the standard comments, you also have the option to create a comment +in the form of a resolvable or threaded discussion. + +## Resolvable discussions + +>**Notes:** +- The main feature was [introduced][ce-5022] in GitLab 8.11. +- Resolvable discussions can be added only to merge request diffs. + +Discussion resolution helps keep track of progress during planning or 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 or the author of the merge request. + +### 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] + +### 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] + +### Move all unresolved discussions in a merge request to an issue + +> [Introduced][ce-8266] in GitLab 9.1 + +To continue all open discussions from a merge request in a new issue, click the +**Resolve all discussions in new issue** button. + +![Open new issue for all unresolved discussions](img/btn_new_issue_for_all_discussions.png) + +Alternatively, when your project only accepts merge requests [when all discussions +are resolved](#only-allow-merge-requests-to-be-merged-if-all-discussions-are-resolved), +there will be an **open an issue to resolve them later** link in the merge +request widget. + +![Link in merge request widget](img/resolve_discussion_open_issue.png) + +This will prepare an issue with its content referring to the merge request and +the unresolved discussions. + +![Issue mentioning discussions in a merge request](img/preview_issue_for_discussions.png) + +Hitting **Submit issue** will cause all discussions to be marked as resolved and +add a note referring to the newly created issue. + +![Mark discussions as resolved notice](img/resolve_discussion_issue_notice.png) + +You can now proceed to merge the merge request from the UI. + +### Moving a single discussion to a new issue + +> [Introduced][ce-8266] in GitLab 9.1 + +To create a new issue for a single discussion, you can use the **Resolve this +discussion in a new issue** button. + +![Create issue for discussion](img/new_issue_for_discussion.png) + +This will direct you to a new issue prefilled with the content of the +discussion, similar to the issues created for delegating multiple +discussions at once. Saving the issue will mark the discussion as resolved and +add a note to the merge request discussion referencing the new issue. + +![New issue for a single discussion](img/preview_issue_for_discussion.png) + +### Only allow merge requests to be merged if all discussions are resolved + +> [Introduced][ce-7125] in GitLab 8.14. + +You can prevent merge requests from being merged until all discussions are +resolved. + +Navigate to your project's settings page, select the +**Only allow merge requests to be merged if all discussions are resolved** check +box and hit **Save** for the changes to take effect. + +![Only allow merge if all the discussions are resolved settings](img/only_allow_merge_if_all_discussions_are_resolved.png) + +From now on, you will not be able to merge from the UI until all discussions +are resolved. + +![Only allow merge if all the discussions are resolved message](img/only_allow_merge_if_all_discussions_are_resolved_msg.png) + +## Threaded discussions + +> [Introduced][ce-7527] in GitLab 9.1. + +While resolvable discussions are only available to merge request diffs, +discussions can also be added without a diff. You can start a specific +discussion which will look like a thread, on issues, commits, snippets, and +merge requests. + +To start a threaded discussion, click on the **Comment** button toggle dropdown, +select **Start discussion** and click **Start discussion** when you're ready to +post the comment. + +![Comment type toggle](img/comment_type_toggle.gif) + +This will post a comment with a single thread to allow you to discuss specific +comments in greater detail. + +![Discussion comment](img/discussion_comment.png) + +[ce-5022]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5022 +[ce-7125]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7125 +[ce-7527]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7527 +[ce-7180]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7180 +[ce-8266]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8266 +[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 +[markdown]: ../markdown.md +[slash commands]: ../project/slash_commands.md +[permissions]: ../permissions.md diff --git a/doc/user/img/btn_new_issue_for_all_discussions.png b/doc/user/img/btn_new_issue_for_all_discussions.png deleted file mode 100644 index b15447ec290..00000000000 Binary files a/doc/user/img/btn_new_issue_for_all_discussions.png and /dev/null differ diff --git a/doc/user/img/comment_type_toggle.gif b/doc/user/img/comment_type_toggle.gif deleted file mode 100644 index b73c197b97f..00000000000 Binary files a/doc/user/img/comment_type_toggle.gif and /dev/null differ diff --git a/doc/user/img/discussion_comment.png b/doc/user/img/discussion_comment.png deleted file mode 100644 index 8f66d138922..00000000000 Binary files a/doc/user/img/discussion_comment.png and /dev/null differ diff --git a/doc/user/img/discussion_view.png b/doc/user/img/discussion_view.png deleted file mode 100644 index 2ee1db2eab3..00000000000 Binary files a/doc/user/img/discussion_view.png and /dev/null differ diff --git a/doc/user/img/discussions_resolved.png b/doc/user/img/discussions_resolved.png deleted file mode 100644 index 3fd496f6da5..00000000000 Binary files a/doc/user/img/discussions_resolved.png and /dev/null differ diff --git a/doc/user/img/new_issue_for_discussion.png b/doc/user/img/new_issue_for_discussion.png deleted file mode 100644 index 93c9dad8921..00000000000 Binary files a/doc/user/img/new_issue_for_discussion.png and /dev/null differ diff --git a/doc/user/img/only_allow_merge_if_all_discussions_are_resolved.png b/doc/user/img/only_allow_merge_if_all_discussions_are_resolved.png deleted file mode 100644 index 928c7d33898..00000000000 Binary files a/doc/user/img/only_allow_merge_if_all_discussions_are_resolved.png and /dev/null differ diff --git a/doc/user/img/only_allow_merge_if_all_discussions_are_resolved_msg.png b/doc/user/img/only_allow_merge_if_all_discussions_are_resolved_msg.png deleted file mode 100644 index bcdc0250d7c..00000000000 Binary files a/doc/user/img/only_allow_merge_if_all_discussions_are_resolved_msg.png and /dev/null differ diff --git a/doc/user/img/preview_issue_for_discussion.png b/doc/user/img/preview_issue_for_discussion.png deleted file mode 100644 index 2ee0653b2ba..00000000000 Binary files a/doc/user/img/preview_issue_for_discussion.png and /dev/null differ diff --git a/doc/user/img/preview_issue_for_discussions.png b/doc/user/img/preview_issue_for_discussions.png deleted file mode 100644 index 3fe0a666678..00000000000 Binary files a/doc/user/img/preview_issue_for_discussions.png and /dev/null differ diff --git a/doc/user/img/resolve_comment_button.png b/doc/user/img/resolve_comment_button.png deleted file mode 100644 index 70340108874..00000000000 Binary files a/doc/user/img/resolve_comment_button.png and /dev/null differ diff --git a/doc/user/img/resolve_discussion_button.png b/doc/user/img/resolve_discussion_button.png deleted file mode 100644 index ab454f661e0..00000000000 Binary files a/doc/user/img/resolve_discussion_button.png and /dev/null differ diff --git a/doc/user/img/resolve_discussion_issue_notice.png b/doc/user/img/resolve_discussion_issue_notice.png deleted file mode 100644 index e0ee6a39ffd..00000000000 Binary files a/doc/user/img/resolve_discussion_issue_notice.png and /dev/null differ diff --git a/doc/user/img/resolve_discussion_open_issue.png b/doc/user/img/resolve_discussion_open_issue.png deleted file mode 100644 index 98d63278326..00000000000 Binary files a/doc/user/img/resolve_discussion_open_issue.png and /dev/null differ diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md index 237d7db30fc..954454f7e7a 100644 --- a/doc/user/project/merge_requests/index.md +++ b/doc/user/project/merge_requests/index.md @@ -34,7 +34,7 @@ Keep track of the progress during a code review with resolving comments. Resolving comments prevents you from forgetting to address feedback and lets you hide discussions that are no longer relevant. -[Read more about resolving discussion comments in merge requests reviews.](../../discussions.md) +[Read more about resolving discussion comments in merge requests reviews.](../../discussions/index.md) ## Resolve conflicts diff --git a/doc/user/project/merge_requests/merge_request_discussion_resolution.md b/doc/user/project/merge_requests/merge_request_discussion_resolution.md new file mode 100644 index 00000000000..200965875a1 --- /dev/null +++ b/doc/user/project/merge_requests/merge_request_discussion_resolution.md @@ -0,0 +1 @@ +This document was moved to [another location](../../discussions/index.md). diff --git a/doc/workflow/README.md b/doc/workflow/README.md index edcb03e03b1..604c7d5cefb 100644 --- a/doc/workflow/README.md +++ b/doc/workflow/README.md @@ -32,7 +32,7 @@ - [Authorization for merge requests](../user/project/merge_requests/authorization_for_merge_requests.md) - [Cherry-pick changes](../user/project/merge_requests/cherry_pick_changes.md) - [Merge when pipeline succeeds](../user/project/merge_requests/merge_when_pipeline_succeeds.md) - - [Resolve discussion comments in merge requests reviews](../user/discussions.md) + - [Resolve discussion comments in merge requests reviews](../user/discussions/index.md) - [Resolve merge conflicts in the UI](../user/project/merge_requests/resolve_conflicts.md) - [Revert changes in the UI](../user/project/merge_requests/revert_changes.md) - [Merge requests versions](../user/project/merge_requests/versions.md) -- cgit v1.2.1