summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-08-20 00:40:34 +0000
committerGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2019-08-23 10:08:15 +0000
commit8e15396b8b35353f392ce1a667c7d12415a058ed (patch)
tree53355438382e6c2631466494a09cc7b3a76a8d7c
parent34cb960adfaa7ab124bc88dab2138e948182cf32 (diff)
downloadgitlab-ce-8e15396b8b35353f392ce1a667c7d12415a058ed.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 (cherry picked from commit 0a16c8e1964a169363597630ae3cda1ffb8f2b83) c867db91 Add documentation for incrementally expand mr diffs e9d917c2 Apply suggestion to doc/user/project/merge_requests/index.md
-rw-r--r--doc/user/project/merge_requests/img/incrementally_expand_merge_request_diffs_v12_2.pngbin0 -> 96982 bytes
-rw-r--r--doc/user/project/merge_requests/index.md9
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
new file mode 100644
index 00000000000..ee94dbdea5c
--- /dev/null
+++ b/doc/user/project/merge_requests/img/incrementally_expand_merge_request_diffs_v12_2.png
Binary files differ
diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md
index 524fd5c7bdc..04db54872d3 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