diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2018-09-20 17:02:29 +0000 |
---|---|---|
committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-10-02 17:26:07 +0200 |
commit | 88ad6c7fe793a12fbf75cce01ae15d2868f306d0 (patch) | |
tree | d1eb5554ed56a7845be408a68a85a590430cdb3c /doc | |
parent | 3dec816a21ea06db9db7b78c821a037e24bf3113 (diff) | |
download | gitlab-ce-88ad6c7fe793a12fbf75cce01ae15d2868f306d0.tar.gz |
Merge branch 'jr-wiki-doc' into 'master'
Update wiki upload documentation
See merge request gitlab-org/gitlab-ce!21815
Diffstat (limited to 'doc')
-rw-r--r-- | doc/user/project/wiki/index.md | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/doc/user/project/wiki/index.md b/doc/user/project/wiki/index.md index ad0ef60373c..127a30d6669 100644 --- a/doc/user/project/wiki/index.md +++ b/doc/user/project/wiki/index.md @@ -40,11 +40,6 @@ support Markdown, RDoc and AsciiDoc. For Markdown based pages, all the [Markdown features](../../markdown.md) are supported and for links there is some [wiki specific](../../markdown.md#wiki-specific-markdown) behavior. ->**Note:** -The wiki is based on a Git repository and contains only text files. Uploading -files via the web interface will upload them in GitLab itself, and they will -not be available if you clone the wiki repo locally. - In the web interface the commit message is optional, but the GitLab Wiki is based on Git and needs a commit message, so one will be created for you if you do not enter one. @@ -53,6 +48,14 @@ When you're ready, click the **Create page** and the new page will be created. ![New page](img/wiki_create_new_page.png) +> [Introduced](https://gitlab.com/gitlab-org/gitlab-ce/issues/33475) in GitLab 11.3. + +Starting with GitLab 11.3, any file that is uploaded to the wiki via GitLab's +interface will be stored in the wiki Git repository, and it will be available +if you clone the wiki repository locally. All uploaded files prior to GitLab +11.3 are stored in GitLab itself. If you want them to be part of the wiki's Git +repository, you will have to upload them again. + ## Editing a wiki page To edit a page, simply click on the **Edit** button. From there on, you can |