diff options
author | Evan Read <eread@gitlab.com> | 2019-08-20 00:40:34 +0000 |
---|---|---|
committer | Evan Read <eread@gitlab.com> | 2019-08-20 00:40:34 +0000 |
commit | 0a16c8e1964a169363597630ae3cda1ffb8f2b83 (patch) | |
tree | 6033f0827104db4537c814aea1ad88dc27109c76 | |
parent | b19707b8bd76730416f9db05ef1469305ed68632 (diff) | |
parent | 8a7fa21a7df1d90cfe602d573a50fbec786afa50 (diff) | |
download | gitlab-ce-0a16c8e1964a169363597630ae3cda1ffb8f2b83.tar.gz |
Merge branch 'docs-66076-expansion-options' into 'master'
Add documentation for incrementally expand mr diffs
See merge request gitlab-org/gitlab-ce!31878
-rw-r--r-- | doc/user/project/merge_requests/img/incrementally_expand_merge_request_diffs_v12_2.png | bin | 0 -> 96982 bytes | |||
-rw-r--r-- | doc/user/project/merge_requests/index.md | 9 |
2 files changed, 9 insertions, 0 deletions
diff --git a/doc/user/project/merge_requests/img/incrementally_expand_merge_request_diffs_v12_2.png b/doc/user/project/merge_requests/img/incrementally_expand_merge_request_diffs_v12_2.png Binary files differnew file mode 100644 index 00000000000..ee94dbdea5c --- /dev/null +++ b/doc/user/project/merge_requests/img/incrementally_expand_merge_request_diffs_v12_2.png diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md index 8a82b163481..2794cbc0f39 100644 --- a/doc/user/project/merge_requests/index.md +++ b/doc/user/project/merge_requests/index.md @@ -497,6 +497,15 @@ list. ![Merge request diff file navigation](img/merge_request_diff_file_navigation.png) +### Incrementally expand merge request diffs + +By default, the diff shows only the parts of a file which are changed. +To view more unchanged lines above or below a change click on the +**Expand up** or **Expand down** icons. You can also click on **Show all lines** +to expand the entire file. + +![Incrementally expand merge request diffs](img/incrementally_expand_merge_request_diffs_v12_2.png) + ## Ignore whitespace changes in Merge Request diff view If you click the **Hide whitespace changes** button, you can see the diff |