Merge branch 'ce-to-ee-2018-05-31' into 'master'

CE upstream - 2018-05-31 06:24 UTC

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

doc/user/project/index.md

@@ -79,6 +79,8 @@ website with GitLab Pages
 
 **Other features:**
 
+- [Wiki](wiki/index.md): Document your GitLab project in an integrated Wiki
+- [Snippets](../snippets.md): Store, share and collaborate on code snippets
 - [Cycle Analytics](cycle_analytics.md): Review your development lifecycle
 - [Syntax highlighting](highlighting.md): An alternative to customize
 your code blocks, overriding GitLab's default choice of language