summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcia Ramos <virtua.creative@gmail.com>2017-08-22 17:19:23 +0000
committerMarcia Ramos <virtua.creative@gmail.com>2017-08-22 17:19:23 +0000
commit27bdc4bbdd932121f86752067b983f2bd8bbfd12 (patch)
tree33809cb2188149b394d3d5318ee17d89f2615e24
parent7965f4e7c3826093a74d4909233dc7fb9c0aac97 (diff)
parent918ea3fd8e8699bd0fcd376ef45c91d990170e03 (diff)
downloadgitlab-ce-27bdc4bbdd932121f86752067b983f2bd8bbfd12.tar.gz
Merge branch 'docs-merge-request-diff-nav' into 'master'
Docs merge request diff nav See merge request !13743
-rw-r--r--doc/user/project/merge_requests/img/merge_request_diff_file_navigation.pngbin0 -> 76052 bytes
-rw-r--r--doc/user/project/merge_requests/index.md8
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/user/project/merge_requests/img/merge_request_diff_file_navigation.png b/doc/user/project/merge_requests/img/merge_request_diff_file_navigation.png
new file mode 100644
index 00000000000..9b8aee47411
--- /dev/null
+++ b/doc/user/project/merge_requests/img/merge_request_diff_file_navigation.png
Binary files differ
diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md
index 285c40729fe..26c6277d33a 100644
--- a/doc/user/project/merge_requests/index.md
+++ b/doc/user/project/merge_requests/index.md
@@ -137,6 +137,14 @@ have been marked as a **Work In Progress**.
[Learn more about settings a merge request as "Work In Progress".](work_in_progress_merge_requests.md)
+## Merge request diff file navigation
+
+The diff view has a persistent dropdown for file navigation. As you scroll through
+diffs with a large number of files and/or many changes in those files, you can
+easily jump to any changed file through the dropdown navigation.
+
+![Merge request diff file navigation](img/merge_request_diff_file_navigation.png)
+
## Ignore whitespace changes in Merge Request diff view
If you click the **Hide whitespace changes** button, you can see the diff