summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-05-31 06:13:28 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-05-31 06:13:28 +0000
commit76099e7a439b6c3d09bb1392486523f09480e7e6 (patch)
tree44fc7439a9f362fafcad1999eb2ac6b3b924532a
parent37a7b590c6b7a881ed014f99571a1f44cb45acab (diff)
parent42460fca4a73bd5efbd3a43a5c9345bef65fe39a (diff)
downloadgitlab-ce-76099e7a439b6c3d09bb1392486523f09480e7e6.tar.gz
Merge branch 'add-project-features-docs' into 'master'
Add Wiki and Snippets to project feature overview See merge request gitlab-org/gitlab-ce!19235
-rw-r--r--doc/user/project/index.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/user/project/index.md b/doc/user/project/index.md
index 557375a1da9..e63ed88249d 100644
--- a/doc/user/project/index.md
+++ b/doc/user/project/index.md
@@ -72,6 +72,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