diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-11-25 12:51:12 +0100 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2016-11-29 11:35:30 +0100 |
| commit | adb3f3d4e494e8f8d41c1b9e676e395a49cd96b2 (patch) | |
| tree | 67e0de476d12bfd5a696e332deee8cc0e46e4ba2 /doc/workflow | |
| parent | b8e10e327fa2b51a7f645f10576b26dca0b8341e (diff) | |
| download | gitlab-ce-adb3f3d4e494e8f8d41c1b9e676e395a49cd96b2.tar.gz | |
Move MWPS document to new location
Diffstat (limited to 'doc/workflow')
| -rw-r--r-- | doc/workflow/README.md | 4 | ||||
| -rw-r--r-- | doc/workflow/merge_when_build_succeeds.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/workflow/README.md b/doc/workflow/README.md index 57a0d21c7a7..59a806de210 100644 --- a/doc/workflow/README.md +++ b/doc/workflow/README.md @@ -25,12 +25,12 @@ - [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 pipeline succeeds](../user/project/merge_requests/merge_when_build_succeeds.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 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) +- [Importing from SVN, GitHub, Bitbucket, etc](importing/README.md) - [Todos](todos.md) diff --git a/doc/workflow/merge_when_build_succeeds.md b/doc/workflow/merge_when_build_succeeds.md index 95afd12ebdb..b4f6d6117de 100644 --- a/doc/workflow/merge_when_build_succeeds.md +++ b/doc/workflow/merge_when_build_succeeds.md @@ -1 +1 @@ -This document was moved to [user/project/merge_requests/merge_when_build_succeeds](../user/project/merge_requests/merge_when_build_succeeds.md). +This document was moved to [merge_when_pipeline_succeeds](../user/project/merge_requests/merge_when_pipeline_succeeds.md). |