Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-01-27 06:08:58 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-01-27 06:08:58 +0300
commit53e4185a6e266ac3ebb70663e9825c84b66f0b5e (patch)
treef26610b2991bc68bf6d2c4c1f75ae95ba1d23950 /doc/development/wikis.md
parent7ace0e99be20db28a517b9d464cb3363d26766c9 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/wikis.md')
-rw-r--r--doc/development/wikis.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/development/wikis.md b/doc/development/wikis.md
index a2da4843eac..1984e77866d 100644
--- a/doc/development/wikis.md
+++ b/doc/development/wikis.md
@@ -12,8 +12,8 @@ description: "GitLab's development guidelines for Wikis"
## Overview
-The wiki functionality in GitLab is based on [Gollum 4.x](https://github.com/gollum/gollum/),
-which is used in [Gitaly's](gitaly.md) Ruby service and accessed from the Rails app through Gitaly RPC calls.
+The wiki functionality in GitLab is based on [Gollum 4.x](https://github.com/gollum/gollum/).
+It's used in [Gitaly's](gitaly.md) Ruby service, and accessed from the Rails app through Gitaly RPC calls.
Wikis use Git repositories as storage backend, and can be accessed through:
@@ -43,7 +43,7 @@ When rendering wiki pages, we don't use Gollum at all and instead go through a
[custom Banzai pipeline](https://gitlab.com/gitlab-org/gitlab/blob/master/lib/banzai/pipeline/wiki_pipeline.rb).
This adds some [wiki-specific markup](../user/markdown.md#wiki-specific-markdown), such as Gollum's `[[link]]` syntax.
-Since we do not make use of most of Gollum's features, we plan to move away from it entirely at some point.
+Because we do not make use of most of Gollum's features, we plan to move away from it entirely at some point.
[See this epic](https://gitlab.com/groups/gitlab-org/-/epics/2381) for reference.
## Model classes