Add latest changes from gitlab-org/gitlab@master

3 files changed, 24 insertions, 19 deletions

diff --git a/doc/update/removals.md b/doc/update/removals.md
index b9122bd6b52..2dd92093d87 100644
--- a/doc/update/removals.md
+++ b/doc/update/removals.md
@@ -36,9 +36,14 @@ For removal reviewers (Technical Writers only):
 
 ## Removed in 15.11
 
-### Exporting and importing groups and projects in JSON format is no longer supported
+### Exporting and importing projects in JSON format not supported
 
-Before version 14.0, GitLab produced project file exports in JSON format. To support transitions, importing JSON-formatted group and project file exports was still possible if you configured the relevant feature flags. As of GitLab 15.11, importing a JSON-formatted group and project file export is no longer supported.
+GitLab previously created project file exports in JSON format. In GitLab 12.10, NDJSON was added as the preferred format.
+
+To support transitions, importing JSON-formatted project file exports was still possible if you configured the
+relevant feature flags.
+
+From GitLab 15.11, importing a JSON-formatted project file exports is not supported.
 
 ## Removed in 15.9
 
@@ -61,6 +66,15 @@ If you want to preserve this functionality, you can follow one of these two path
 1. Fork the [GitLab Auto Deploy Helm chart](https://gitlab.com/gitlab-org/cluster-integration/auto-deploy-image/-/tree/master/assets/auto-deploy-app) into the `chart/` path within your project
 1. Set `AUTO_DEPLOY_IMAGE_VERSION` and `DAST_AUTO_DEPLOY_IMAGE_VERSION` to the most recent version of the image that included the CiliumNetworkPolicy
 
+### Exporting and importing groups in JSON format not supported
+
+GitLab previously created group file exports in JSON format. In GitLab 13.10, NDJSON was added as the preferred format.
+
+To support transitions, importing JSON-formatted group file exports was still possible if you configured the
+relevant feature flags.
+
+From GitLab 15.8, importing a JSON-formatted group file exports is not supported.
+
 ### `artifacts:public` CI/CD keyword refactored
 
 WARNING:
diff --git a/doc/user/group/import/index.md b/doc/user/group/import/index.md
index b0297076a43..7f1dca0f89f 100644
--- a/doc/user/group/import/index.md
+++ b/doc/user/group/import/index.md
@@ -429,13 +429,11 @@ Note the following:
 
 ### Compatibility
 
-Group file exports are in NDJSON format. GitLab previously produced group file exports in JSON format, however:
+> Support for JSON-formatted project file exports [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/383682) in GitLab 15.8.
 
-- From GitLab 15.8, GitLab no longer supports importing a JSON-formatted group file export.
-- Between GitLab 14.0 and GitLab 14.7, GitLab no longer produces group file exports in JSON format but, to support
-  transitions, can still import JSON-formatted group file exports.
+Group file exports are in NDJSON format.
 
-From GitLab 13.0, GitLab can import group file exports that were exported from a version of GitLab up to two
+You can import group file exports that were exported from a version of GitLab up to two
 [minor](../../../policy/maintenance.md#versioning) versions behind, which is similar to our process for
 [security releases](../../../policy/maintenance.md#security-releases).
 
diff --git a/doc/user/project/settings/import_export.md b/doc/user/project/settings/import_export.md
index 6ea4d655b88..d221e424577 100644
--- a/doc/user/project/settings/import_export.md
+++ b/doc/user/project/settings/import_export.md
@@ -29,18 +29,11 @@ If you migrate from GitLab.com to self-managed GitLab, an administrator can crea
 
 ## Compatibility
 
-FLAG:
-On self-managed GitLab by default project, file exports are in NDJSON format. To make GitLab produce project file
-exports in JSON format, ask an administrator to [disable the feature flags](../../../administration/feature_flags.md)
-named `project_export_as_ndjson`. To allow GitLab to import project file exports in JSON format, ask an administrator to
-[disable the feature flags](../../../administration/feature_flags.md) named `project_import_ndjson`. On GitLab.com,
-project file exports are in NDJSON format only.
-
-Project file exports are in NDJSON format. Before version 14.0, GitLab produced project file exports in JSON format.
-To support transitions, you can still import JSON-formatted project file exports if you configure the relevant feature
-flags.
-
-From GitLab 13.0, GitLab can import project file exports that were exported from a version of GitLab up to two
+> Support for JSON-formatted project file exports [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/389888) in GitLab 15.11.
+
+Project file exports are in NDJSON format.
+
+You can import project file exports that were exported from a version of GitLab up to two
 [minor](../../../policy/maintenance.md#versioning) versions behind, which is similar to our process for
 [security releases](../../../policy/maintenance.md#security-releases).