diff options
author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-04-21 19:35:23 +0200 |
---|---|---|
committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-04-21 19:35:23 +0200 |
commit | e84787ae085e184c893f7da40ca29a0c5fecf810 (patch) | |
tree | 402942b93a3a13144064145ecd24e48896b88ae0 /doc/user/project/merge_requests | |
parent | e8f635679f2693a804c428782e103a0ce6043cef (diff) | |
download | gitlab-ce-e84787ae085e184c893f7da40ca29a0c5fecf810.tar.gz |
Refactor Discussions docs
- Move to dicsussions/index.md
- Bring back previous path with a link to new location
- Reorder sections
Diffstat (limited to 'doc/user/project/merge_requests')
-rw-r--r-- | doc/user/project/merge_requests/index.md | 2 | ||||
-rw-r--r-- | doc/user/project/merge_requests/merge_request_discussion_resolution.md | 1 |
2 files changed, 2 insertions, 1 deletions
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). |