diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-09-05 23:43:45 +0300 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-09-05 23:43:45 +0300 |
| commit | 7d2bd6b91bdfa0afd6b0032ddf23c24a28c61056 (patch) | |
| tree | 6377c269a9cf66d9223e9d84fcd44d5d690a3685 /doc/workflow/README.md | |
| parent | 553180e1c87664aae3efba01c30a345a1a2a2a00 (diff) | |
| parent | 026d1acd26dd09a84db969bfc0d5f64e67a5e96f (diff) | |
Merge branch '21857-refactor-merge-requests-documentation' into 'master'
Refactor merge requests documentation
## What does this MR do?
Add more information on merge requests.
## Moving docs to a new location?
See the guidelines: http://docs.gitlab.com/ce/development/doc_styleguide.html#changing-document-location
- [x] Make sure the old link is not removed and has its contents replaced with a link to the new location.
- [x] Make sure internal links pointing to the document in question are not broken.
- [x] Search and replace any links referring to old docs in GitLab Rails app, specifically under the `app/views/` directory.
- [x] If working on CE, submit an MR to EE with the changes as well.
---
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/21857
See merge request !6202
Diffstat (limited to 'doc/workflow/README.md')
| -rw-r--r-- | doc/workflow/README.md | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/doc/workflow/README.md b/doc/workflow/README.md index fe13bd757c5..dcb9c32ad58 100644 --- a/doc/workflow/README.md +++ b/doc/workflow/README.md @@ -1,6 +1,5 @@ # Workflow -- [Authorization for merge requests](authorization_for_merge_requests.md) - [Change your time zone](timezone.md) - [Description templates](../user/project/description_templates.md) - [Feature branch workflow](workflow.md) @@ -21,11 +20,15 @@ - [Web Editor](../user/project/repository/web_editor.md) - [Releases](releases.md) - [Milestones](milestones.md) -- [Merge Requests](merge_requests.md) -- [Revert changes](revert_changes.md) -- [Cherry-pick changes](cherry_pick_changes.md) -- ["Work In Progress" Merge Requests](wip_merge_requests.md) -- [Merge When Build Succeeds](merge_when_build_succeeds.md) +- [Merge Requests](../user/project/merge_requests.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 build succeeds](../user/project/merge_requests/merge_when_build_succeeds.md) + - [Resolve discussion comments in merge requests reviews](../user/project/merge_requests/merge_request_discussion_resolution.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) + - ["Work In Progress" merge requests](../user/project/merge_requests/work_in_progress_merge_requests.md) - [Manage large binaries with Git LFS](lfs/manage_large_binaries_with_git_lfs.md) - [Importing from SVN, GitHub, BitBucket, etc](importing/README.md) - [Todos](todos.md) |