Merge branch 'ce-to-ee-2018-10-12' into 'master'

CE upstream - 2018-10-12 20:21 UTC

See merge request gitlab-org/gitlab-ee!7915

doc/update/11.3-to-11.4.md

@@ -80,8 +80,8 @@ More information can be found on the [yarn website](https://yarnpkg.com/en/docs/
 
 ### 5. Update Go
 
-NOTE: GitLab 11.0 and higher only supports Go 1.9.x and newer, and dropped support for Go
-1.5.x through 1.8.x. Be sure to upgrade your installation if necessary.
+NOTE: GitLab 11.4 and higher only supports Go 1.10.x and newer, and dropped support for Go
+1.9.x. Be sure to upgrade your installation if necessary.
 
 You can check which version you are running with `go version`.
 

doc/user/project/merge_requests/index.md

@@ -309,9 +309,9 @@ all your changes will be available to preview by anyone with the Review Apps lin
 
 ## 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)