From b381a70264f81842fa48112e540c5289e490fad4 Mon Sep 17 00:00:00 2001 From: James Nutt Date: Mon, 30 Dec 2024 16:04:31 +0000 Subject: [PATCH] Enable third-party UCM flags by default This MR sets bitbucket_server_user_mapping and gitea_user_mapping to be enabled by default for self-managed instances. The paired flag, `importer_user_mapping` was enabled by default in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/175371 The flag for GitHub was enabled by default in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/176633 Changelog: added --- config/feature_flags/beta/bitbucket_server_user_mapping.yml | 2 +- config/feature_flags/beta/gitea_user_mapping.yml | 2 +- doc/user/project/import/index.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/feature_flags/beta/bitbucket_server_user_mapping.yml b/config/feature_flags/beta/bitbucket_server_user_mapping.yml index 7c8e0805ebb91c..2e9ae4c2588566 100644 --- a/config/feature_flags/beta/bitbucket_server_user_mapping.yml +++ b/config/feature_flags/beta/bitbucket_server_user_mapping.yml @@ -6,4 +6,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/509897 milestone: '17.7' group: group::import and integrate type: beta -default_enabled: false +default_enabled: true diff --git a/config/feature_flags/beta/gitea_user_mapping.yml b/config/feature_flags/beta/gitea_user_mapping.yml index 9a71dff97c2cf3..08ec0c65f4c637 100644 --- a/config/feature_flags/beta/gitea_user_mapping.yml +++ b/config/feature_flags/beta/gitea_user_mapping.yml @@ -6,4 +6,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/498390 milestone: '17.6' group: group::import and integrate type: beta -default_enabled: false +default_enabled: true diff --git a/doc/user/project/import/index.md b/doc/user/project/import/index.md index 85d7a524e9a4bd..80ec5a071ecc56 100644 --- a/doc/user/project/import/index.md +++ b/doc/user/project/import/index.md @@ -90,7 +90,7 @@ DETAILS: > - Introduced in GitLab 17.7 [for Bitbucket Server](https://gitlab.com/gitlab-org/gitlab/-/issues/466356) [with flags](../../../administration/feature_flags.md) named `importer_user_mapping` and `bitbucket_server_user_mapping`. Disabled by default. > - [Enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/472735) for direct transfer in GitLab 17.7. > - Enabled on GitLab.com for [GitHub](https://gitlab.com/gitlab-org/gitlab/-/issues/499993), [Bitbucket Server](https://gitlab.com/gitlab-org/gitlab/-/issues/509897), and [Gitea](https://gitlab.com/gitlab-org/gitlab/-/issues/498390) in GitLab 17.7. -> - Enabled on self-managed for [GitHub](https://gitlab.com/gitlab-org/gitlab/-/issues/499993) in GitLab 17.8. +> - Enabled on self-managed for [GitHub](https://gitlab.com/gitlab-org/gitlab/-/issues/499993), [Bitbucket Server](https://gitlab.com/gitlab-org/gitlab/-/issues/509897) and [Gitea](https://gitlab.com/gitlab-org/gitlab/-/issues/498390) in GitLab 17.8. FLAG: The availability of this feature is controlled by feature flags. -- GitLab