delta/gitlab/gitlab-ce.git/doc/user, branch github-avoid-conflicts-with-admin-labels gitlab.com: gitlab-org/gitlab-ce.git Add changelog entry and documentation for merge request versions compare 2016-09-07T07:24:48+00:00 Dmitriy Zaporozhets dmitriy.zaporozhets@gmail.com 2016-09-05T07:42:49+00:00 a449124a76c783f619c4b57e0c8380cdb3bb5c4c Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Merge branch '21857-refactor-merge-requests-documentation' into 'master' 2016-09-05T20:43:45+00:00 Achilleas Pipinellis axilleas@axilleas.me 2016-09-05T20:43:45+00:00 7d2bd6b91bdfa0afd6b0032ddf23c24a28c61056 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 

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
 Refactor authorization_for_merge_requests.md 2016-09-05T17:32:37+00:00 Achilleas Pipinellis axilleas@axilleas.me 2016-09-05T17:32:37+00:00 026d1acd26dd09a84db969bfc0d5f64e67a5e96f 






Add links to new docs in merge_requests.md and workflow/README.md
2016-09-05T16:25:05+00:00

Achilleas Pipinellis
axilleas@axilleas.me

2016-09-05T16:25:05+00:00

bf00e0f4b2fd8994df8f7b567839f12715a05fde












Move merge request versions to its own document
2016-09-05T13:04:51+00:00

Achilleas Pipinellis
axilleas@axilleas.me

2016-09-05T13:04:51+00:00

99f28c50d5483d6f55e7accaf1806e68acc46568












Move "Only allow merge requests to be merged if the build succeeds" to new location
2016-09-05T12:15:57+00:00

Achilleas Pipinellis
axilleas@axilleas.me

2016-09-05T12:15:57+00:00

4d77056af1ca5532ae8482b362b5ef466a640ae2












Move revert_changes.md to new location
2016-09-05T11:46:37+00:00

Achilleas Pipinellis
axilleas@axilleas.me

2016-09-05T11:46:37+00:00

a8ba5840e0c86f3fb72cf81940674698e02ed025












Move cherry_pick_changes.md to new location
2016-09-05T11:40:41+00:00

Achilleas Pipinellis
axilleas@axilleas.me

2016-09-05T11:40:41+00:00

14a96a1ad2d96078cbd73a60e260601f47373060












Move `wip_merge_requests.md` to a new location
2016-09-05T11:33:45+00:00

Achilleas Pipinellis
axilleas@axilleas.me

2016-09-05T11:33:45+00:00

99e03f80ca875d261622268cf11eb63a02ae2bf5












Move merge_when_build_succeeds.md to new location
2016-09-05T11:21:22+00:00

Achilleas Pipinellis
axilleas@axilleas.me

2016-09-05T11:21:22+00:00

cbc97870bc03d987d82dac679d2a81eee54a4448