summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcia Ramos <virtua.creative@gmail.com>2018-10-12 20:00:43 +0000
committerJan Provaznik <jprovaznik@gitlab.com>2018-10-15 13:27:15 +0200
commitb693a65c310e06ae644d235b00dc5a521265b3e6 (patch)
treee9823ed9d910a9428e9f5ebc1e569d5a95aeb226
parent714e7eb12e218b1707bcd6e4257426d59598a631 (diff)
downloadgitlab-ce-b693a65c310e06ae644d235b00dc5a521265b3e6.tar.gz
Merge branch 'jr-merge-file-tree-docs' into 'master'
Update merge request diff navigation docs See merge request gitlab-org/gitlab-ce!22275
-rw-r--r--doc/user/project/merge_requests/img/merge_request_diff_file_navigation.pngbin112288 -> 111544 bytes
-rw-r--r--doc/user/project/merge_requests/index.md6
2 files changed, 3 insertions, 3 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
index ac766c99935..3b3bf88df31 100644
--- 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
Binary files differ
diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md
index 43ca498d006..f9ebf277125 100644
--- a/doc/user/project/merge_requests/index.md
+++ b/doc/user/project/merge_requests/index.md
@@ -205,9 +205,9 @@ have been marked as a **Work In Progress**.
## 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.
+The diff view has a file tree for file navigation. As you scroll through
+diffs with a large number of files, you can easily jump to any changed file
+using the file tree.
![Merge request diff file navigation](img/merge_request_diff_file_navigation.png)