summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-09-20 17:02:29 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-09-20 17:02:29 +0000
commit732538c4d9aa3227aea740b3d13a10b2c0a36b29 (patch)
tree2ca9ce64c9af17ac43da1be77f735262f2433b41
parent7d6c66381cffc211a0de87911d037b415f8d1fa3 (diff)
parentf1c71cd975785a9db702e9447fb40e6c86754f79 (diff)
downloadgitlab-ce-732538c4d9aa3227aea740b3d13a10b2c0a36b29.tar.gz
Merge branch 'jr-wiki-doc' into 'master'
Update wiki upload documentation See merge request gitlab-org/gitlab-ce!21815
-rw-r--r--doc/user/project/wiki/index.md13
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