Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-04-24 17:11:36 +0300
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-04-24 17:11:36 +0300
commit56ab571fd3b4c589e040b40cf9bd81044b5d8ee3 (patch)
tree2d106526d9a80ef446198a33b2265b74e53d50d6 /doc/workflow/README.md
parentf7723b8ebdc437feb731275d9a3cc109a6ce1761 (diff)
parentc768026474b9dff9f6f988372e4eefb85b1d8be9 (diff)
Merge branch 'master' into 20827-getting-started-update-new-group-view20827-getting-started-update-new-group-view
Diffstat (limited to 'doc/workflow/README.md')
-rw-r--r--doc/workflow/README.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/workflow/README.md b/doc/workflow/README.md
index a1852650cfb..604c7d5cefb 100644
--- a/doc/workflow/README.md
+++ b/doc/workflow/README.md
@@ -27,12 +27,12 @@
- [Time tracking](time_tracking.md)
- [Web Editor](../user/project/repository/web_editor.md)
- [Releases](releases.md)
-- [Milestones](milestones.md)
+- [Milestones](../user/project/milestones/index.md)
- [Merge Requests](../user/project/merge_requests/index.md)
- [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/project/merge_requests/merge_request_discussion_resolution.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)