Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 31 deletions

diff --git a/doc/api/services.md b/doc/api/services.md
index c4bd5f86e43..4052fd22641 100644
--- a/doc/api/services.md
+++ b/doc/api/services.md
@@ -496,12 +496,6 @@ GET /projects/:id/services/emails-on-push
 ## Confluence service
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/220934) in GitLab 13.2.
-> - It's deployed behind a feature flag, disabled by default.
-> - It's disabled on GitLab.com.
-> - It's able to be enabled or disabled per-project
-> - It's not recommended for production use.
-> - To use it in GitLab self-managed instances, ask a GitLab administrator to
-    [enable it](#enable-or-disable-the-confluence-service-core-only). **(CORE ONLY)**
 
 Replaces the link to the internal wiki with a link to a Confluence Cloud Workspace.
 
@@ -535,31 +529,6 @@ Get Confluence service settings for a project.
 GET /projects/:id/services/confluence
 ```
 
-### Enable or disable the Confluence service **(CORE ONLY)**
-
-The Confluence service is under development and not ready for production use. It is
-deployed behind a feature flag that is **disabled by default**.
-[GitLab administrators with access to the GitLab Rails console](../administration/feature_flags.md)
-can enable it for your instance. The Confluence service can be enabled or disabled per-project
-
-To enable it:
-
-```ruby
-# Instance-wide
-Feature.enable(:confluence_integration)
-# or by project
-Feature.enable(:confluence_integration, Project.find(<project id>))
-```
-
-To disable it:
-
-```ruby
-# Instance-wide
-Feature.disable(:confluence_integration)
-# or by project
-Feature.disable(:confluence_integration, Project.find(<project id>))
-```
-
 ## External Wiki
 
 Replaces the link to the internal wiki with a link to an external wiki.