diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-09-05 15:04:51 +0200 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-09-05 15:04:51 +0200 |
| commit | 99f28c50d5483d6f55e7accaf1806e68acc46568 (patch) | |
| tree | 878e5e0c98bc8e0e381bd06f79a4a2e769662f3f | |
| parent | 4d77056af1ca5532ae8482b362b5ef466a640ae2 (diff) | |
| download | gitlab-ce-99f28c50d5483d6f55e7accaf1806e68acc46568.tar.gz | |
Move merge request versions to its own document
| -rw-r--r-- | doc/user/project/merge_requests.md | 6 | ||||
| -rw-r--r-- | doc/user/project/merge_requests/img/versions.png | bin | 100566 -> 35001 bytes | |||
| -rw-r--r-- | doc/user/project/merge_requests/versions.md | 22 |
3 files changed, 23 insertions, 5 deletions
diff --git a/doc/user/project/merge_requests.md b/doc/user/project/merge_requests.md index a1f5cc29ba8..f1a14e7e91c 100644 --- a/doc/user/project/merge_requests.md +++ b/doc/user/project/merge_requests.md @@ -73,8 +73,4 @@ It is also working on commits compare view. ## Merge Requests versions -Every time you push to merge request branch, a new version of merge request diff -is created. When you visit the merge request page you see latest version of changes. -However you can select an older one from version dropdown - - +Select an older revision to from the version dropdown. diff --git a/doc/user/project/merge_requests/img/versions.png b/doc/user/project/merge_requests/img/versions.png Binary files differindex c0a6dfe6806..f279ccd7ce3 100644 --- a/doc/user/project/merge_requests/img/versions.png +++ b/doc/user/project/merge_requests/img/versions.png diff --git a/doc/user/project/merge_requests/versions.md b/doc/user/project/merge_requests/versions.md new file mode 100644 index 00000000000..2b1c5ddd562 --- /dev/null +++ b/doc/user/project/merge_requests/versions.md @@ -0,0 +1,22 @@ +# Merge requests versions + +> Will be [introduced][ce-5467] in GitLab 8.12. + +Every time you push to a branch that is tied to a merge request, a new version +of merge request diff is created. When you visit a merge request that contains +more than one pushes, you can select and compare the versions of those merge +request diffs. + +By default, the latest version of changes is shown. However, you +can select an older one from version dropdown. + + + +--- + +>**Note:** +Merge request versions are based on push not on commit. So, if you pushed 5 +commits in a single push, it will be a single option in the dropdown. If you +pushed 5 times, that will count for 5 options. + +[ce-5467]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5467 |
