From 1c78e7264ac5a194b7ecd93fbd2f46e1b8e8e3ca Mon Sep 17 00:00:00 2001 From: carlad-gl Date: Mon, 30 Dec 2024 10:26:34 +1100 Subject: [PATCH 1/4] Set gh user mapping ff to true This sets the default for github user mapping to true in preparation for the feature clean up. Changelog: added --- config/feature_flags/beta/github_user_mapping.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/feature_flags/beta/github_user_mapping.yml b/config/feature_flags/beta/github_user_mapping.yml index a3d7afab2fccf7..f689e9ffae0dc2 100644 --- a/config/feature_flags/beta/github_user_mapping.yml +++ b/config/feature_flags/beta/github_user_mapping.yml @@ -3,7 +3,7 @@ name: github_user_mapping feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/466355 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/169726 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/499993 -milestone: '17.6' +milestone: '17.8' group: group::import and integrate type: beta -default_enabled: false \ No newline at end of file +default_enabled: true \ No newline at end of file -- GitLab From e5407ca345a06a7c5793f66482d591cac1c200d6 Mon Sep 17 00:00:00 2001 From: carlad-gl Date: Tue, 31 Dec 2024 13:25:13 +1100 Subject: [PATCH 2/4] Revert milestone change --- config/feature_flags/beta/github_user_mapping.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/feature_flags/beta/github_user_mapping.yml b/config/feature_flags/beta/github_user_mapping.yml index f689e9ffae0dc2..dd7f6d93e4d009 100644 --- a/config/feature_flags/beta/github_user_mapping.yml +++ b/config/feature_flags/beta/github_user_mapping.yml @@ -3,7 +3,7 @@ name: github_user_mapping feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/466355 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/169726 rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/499993 -milestone: '17.8' +milestone: '17.6' group: group::import and integrate type: beta default_enabled: true \ No newline at end of file -- GitLab From 0a8f1269acfc82ecb5a9cb587848487d90ccddc2 Mon Sep 17 00:00:00 2001 From: carlad-gl Date: Thu, 2 Jan 2025 11:28:11 +1100 Subject: [PATCH 3/4] Update docs for dedicated and sm --- doc/user/project/import/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/user/project/import/index.md b/doc/user/project/import/index.md index 6a4b336770909a..fe0f55db9e434f 100644 --- a/doc/user/project/import/index.md +++ b/doc/user/project/import/index.md @@ -90,6 +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 and GitLab Dedicated for [GitHub](https://gitlab.com/gitlab-org/gitlab/-/issues/499993) in GitLab 17.8. FLAG: The availability of this feature is controlled by feature flags. -- GitLab From b034122dfbadbb969134887cad059e63f79a36e8 Mon Sep 17 00:00:00 2001 From: Carla Drago Date: Thu, 2 Jan 2025 08:16:35 +0000 Subject: [PATCH 4/4] Add @wortschi 's suggestion --- doc/user/project/import/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/user/project/import/index.md b/doc/user/project/import/index.md index fe0f55db9e434f..85d7a524e9a4bd 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 and GitLab Dedicated 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) in GitLab 17.8. FLAG: The availability of this feature is controlled by feature flags. -- GitLab