Add latest changes from gitlab-org/gitlab@master

3 files changed, 4 insertions, 19 deletions

diff --git a/config/feature_flags/development/remove_user_attributes_groups.yml b/config/feature_flags/development/remove_user_attributes_groups.yml
deleted file mode 100644
index 069d83455f9..00000000000
--- a/config/feature_flags/development/remove_user_attributes_groups.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: remove_user_attributes_groups
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97520
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372047
-milestone: '15.4'
-type: development
-group: group::code review
-default_enabled: false
diff --git a/config/feature_flags/development/remove_user_attributes_projects.yml b/config/feature_flags/development/remove_user_attributes_projects.yml
deleted file mode 100644
index fc1beb42a73..00000000000
--- a/config/feature_flags/development/remove_user_attributes_projects.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: remove_user_attributes_projects
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/97520
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/372047
-milestone: '15.4'
-type: development
-group: group::code review
-default_enabled: false
diff --git a/config/initializers/countries.rb b/config/initializers/countries.rb
index 9f8592ba641..52537b5d885 100644
--- a/config/initializers/countries.rb
+++ b/config/initializers/countries.rb
@@ -4,8 +4,9 @@ ISO3166.configure do |config|
   config.locales = [:en]
 end
 
-# GitLab permits users to sign up in Ukraine except the Crimean Region: https://about.gitlab.com/handbook/people-operations/code-of-conduct/#trade-compliance-exportimport-control
-# This overrides the display name for Ukraine to Ukraine (except Crimean Region)
+# GitLab permits users to sign up in Ukraine except for the regions: Crimea, Donetsk, and Luhansk: https://about.gitlab.com/handbook/people-operations/code-of-conduct/#trade-compliance-exportimport-control
+# This overrides the display name for Ukraine to 'Ukraine (except the Crimea, Donetsk, and Luhansk regions)'
+# See: https://gitlab.com/gitlab-org/gitlab/-/issues/374946
 # To be removed after https://gitlab.com/gitlab-org/gitlab/issues/14784 is implemented
 # Data fetched is based on https://github.com/hexorx/countries/blob/master/lib/countries/data/countries/UA.yaml
 ISO3166::Data.register(
@@ -22,7 +23,7 @@ ISO3166::Data.register(
   international_prefix: '810',
   ioc: "UKR",
   gec: "UP",
-  name: "Ukraine (except Crimean Region)",
+  name: "Ukraine (except the Crimea, Donetsk, and Luhansk regions)",
   national_destination_code_lengths: [2],
   national_number_lengths: [8, 9],
   national_prefix: '8',