From 467a39884503f3f387760b503943e447e8fa6c7e Mon Sep 17 00:00:00 2001
From: Vladlena Shumilo <vshumilo@gitlab.com>
Date: Tue, 5 Oct 2021 12:27:33 -0500
Subject: [PATCH] Remove sync_namespace_name_with_cdot flag

Cleanup the sync_namespace_name_with_cdot
feature flag

Changelog: other
---
 ee/app/models/ee/namespace.rb                            | 1 -
 .../development/sync_namespace_name_with_cdot.yml        | 8 --------
 ee/spec/models/ee/namespace_spec.rb                      | 9 ---------
 3 files changed, 18 deletions(-)
 delete mode 100644 ee/config/feature_flags/development/sync_namespace_name_with_cdot.yml

diff --git a/ee/app/models/ee/namespace.rb b/ee/app/models/ee/namespace.rb
index c6af374cea1..261eafdcd17 100644
--- a/ee/app/models/ee/namespace.rb
+++ b/ee/app/models/ee/namespace.rb
@@ -471,7 +471,6 @@ module EE
     end
 
     def sync_name_with_customers_dot
-      return unless ::Feature.enabled?(:sync_namespace_name_with_cdot)
       return unless ::Gitlab.com?
 
       ::Namespaces::SyncNamespaceNameWorker.perform_async(id)
diff --git a/ee/config/feature_flags/development/sync_namespace_name_with_cdot.yml b/ee/config/feature_flags/development/sync_namespace_name_with_cdot.yml
deleted file mode 100644
index 3950322b8d7..00000000000
--- a/ee/config/feature_flags/development/sync_namespace_name_with_cdot.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: sync_namespace_name_with_cdot
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69896
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/341056
-milestone: '14.3'
-type: development
-group: group::license
-default_enabled: false
diff --git a/ee/spec/models/ee/namespace_spec.rb b/ee/spec/models/ee/namespace_spec.rb
index a197671ac4a..be6999bae7d 100644
--- a/ee/spec/models/ee/namespace_spec.rb
+++ b/ee/spec/models/ee/namespace_spec.rb
@@ -365,7 +365,6 @@ RSpec.describe Namespace do
     subject(:update_namespace) { namespace.update!(attributes) }
 
     before do
-      stub_feature_flags(sync_namespace_name_with_cdot: true)
       allow(Gitlab).to receive(:com?).and_return(true)
     end
 
@@ -386,14 +385,6 @@ RSpec.describe Namespace do
     context 'when the name is updated' do
       let(:attributes) { { name: 'Foo' } }
 
-      context 'with :sync_namespace_name_with_cdot feature flag disabled' do
-        before do
-          stub_feature_flags(sync_namespace_name_with_cdot: false)
-        end
-
-        include_examples 'no sync'
-      end
-
       context 'when not on Gitlab.com?' do
         before do
           allow(Gitlab).to receive(:com?).and_return(false)
-- 
2.30.9