Merge branch '408808-remove-before_validation-for-old-import-sources' into 'master'

Remove before_validation for old import sources

See merge request !121995



Merged-by: Etienne Baqué <ebaque@gitlab.com>
Approved-by: Etienne Baqué <ebaque@gitlab.com>
Approved-by: Carla Drago <cdrago@gitlab.com>
Co-authored-by: bmarjanovic <bmarjanovic@gitlab.com>

app/models/application_setting.rb

@@ -761,7 +761,6 @@ def self.kroki_formats_attributes
   before_validation :ensure_uuid!
   before_validation :coerce_repository_storages_weighted, if: :repository_storages_weighted_changed?
   before_validation :normalize_default_branch_name
-  before_validation :remove_old_import_sources
 
   before_save :ensure_runners_registration_token
   before_save :ensure_health_check_access_token
@@ -805,10 +804,6 @@ def instance_review_permitted?
     users_count >= INSTANCE_REVIEW_MIN_USERS
   end
 
-  def remove_old_import_sources
-    self.import_sources -= %w[phabricator gitlab] if self.import_sources
-  end
-
   Recursion = Class.new(RuntimeError)
 
   def self.create_from_defaults

spec/models/application_setting_spec.rb

@@ -320,17 +320,6 @@ def many_usernames(num = 100)
       end
     end
 
-    context 'import_sources validation' do
-      before do
-        subject.import_sources = %w[github bitbucket gitlab git gitlab_project gitea manifest phabricator]
-      end
-
-      it 'removes phabricator as an import source' do
-        subject.validate
-        expect(subject.import_sources).to eq(%w[github bitbucket git gitlab_project gitea manifest])
-      end
-    end
-
     context 'grafana_url validations' do
       before do
         subject.instance_variable_set(:@parsed_grafana_url, nil)