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>2022-02-10 00:15:27 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-02-10 00:15:27 +0300
commit2744f5f9d735d892fad519329ba61544455e5279 (patch)
treeb9a8e3597c7578a948a68c7c671a646f3805aa54 /doc/user/project/wiki
parent1d4597596530af4e651048c14ab7e977cda38a2a (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/project/wiki')
-rw-r--r--doc/user/project/wiki/index.md12
1 files changed, 10 insertions, 2 deletions
diff --git a/doc/user/project/wiki/index.md b/doc/user/project/wiki/index.md
index 5e984c0b2dc..33f6c32d334 100644
--- a/doc/user/project/wiki/index.md
+++ b/doc/user/project/wiki/index.md
@@ -323,9 +323,17 @@ Previously added wiki pages are preserved in case you
want to re-enable the wiki. To re-enable it, repeat the process
to disable the wiki but toggle it on (in blue).
-## Content Editor **(FREE)**
+## Content Editor
-> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/5643) in GitLab 14.0.
+> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/5643) in GitLab 14.0.
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/345398) switching between editing experiences in GitLab 14.7 [with a flag](../../../administration/feature_flags.md) named `wiki_switch_between_content_editor_raw_markdown`. Enabled by default.
+
+FLAG:
+On self-managed GitLab, by default this feature is available.
+To hide the feature, ask an administrator to
+[disable the feature flag](../../../administration/feature_flags.md) named
+`wiki_switch_between_content_editor_raw_markdown`.
+On GitLab.com, this feature is available.
GitLab version 14.0 introduces a WYSIWYG editing experience for GitLab Flavored Markdown
in Wikis through the [Content Editor](../../../development/fe_guide/content_editor.md).