diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-09-22 10:14:46 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-09-22 12:30:36 +0200 |
| commit | ebfb2ea21b4210895711601dd12568557c4b8f3c (patch) | |
| tree | 15c7b28145496b2d5a56009b19d36197c5c288a1 | |
| parent | f4f16c9e0183fd6ccf472fabfa261df5b31cee5e (diff) | |
| download | gitlab-ce-ebfb2ea21b4210895711601dd12568557c4b8f3c.tar.gz | |
Merge branch 'dz-improve-mr-versions-doc' into 'master'
Update merge request versions documentation with new screenshots
For #13570 based on https://gitlab.com/gitlab-org/gitlab-ce/issues/21427
See merge request !6454
| -rw-r--r-- | doc/user/project/merge_requests/img/versions-compare.png | bin | 0 -> 68722 bytes | |||
| -rw-r--r-- | doc/user/project/merge_requests/img/versions-dropdown.png | bin | 0 -> 60587 bytes | |||
| -rw-r--r-- | doc/user/project/merge_requests/img/versions.png | bin | 35001 -> 171413 bytes | |||
| -rw-r--r-- | doc/user/project/merge_requests/versions.md | 6 |
4 files changed, 5 insertions, 1 deletions
diff --git a/doc/user/project/merge_requests/img/versions-compare.png b/doc/user/project/merge_requests/img/versions-compare.png Binary files differnew file mode 100644 index 00000000000..890cae7768c --- /dev/null +++ b/doc/user/project/merge_requests/img/versions-compare.png diff --git a/doc/user/project/merge_requests/img/versions-dropdown.png b/doc/user/project/merge_requests/img/versions-dropdown.png Binary files differnew file mode 100644 index 00000000000..9bab9304e14 --- /dev/null +++ b/doc/user/project/merge_requests/img/versions-dropdown.png diff --git a/doc/user/project/merge_requests/img/versions.png b/doc/user/project/merge_requests/img/versions.png Binary files differindex f279ccd7ce3..6c86f2c68ac 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 index a6aa4b47835..2805fdf635c 100644 --- a/doc/user/project/merge_requests/versions.md +++ b/doc/user/project/merge_requests/versions.md @@ -7,14 +7,18 @@ 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. - + You can also compare the merge request version with older one to see what is changed since then. + + Please note that comments are disabled while viewing outdated merge versions or comparing to versions other than base. |
