Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 19 deletions

diff --git a/app/services/groups/update_service.rb b/app/services/groups/update_service.rb
index 7d0142fc067..d91e09d212a 100644
--- a/app/services/groups/update_service.rb
+++ b/app/services/groups/update_service.rb
@@ -47,10 +47,6 @@ module Groups
     private
 
     def valid_path_change?
-      unless Feature.enabled?(:npm_package_registry_fix_group_path_validation)
-        return valid_path_change_with_npm_packages?
-      end
-
       return true unless group.packages_feature_enabled?
       return true if params[:path].blank?
       return true if group.has_parent?
@@ -68,21 +64,6 @@ module Groups
       false
     end
 
-    # TODO: delete this function along with npm_package_registry_fix_group_path_validation
-    def valid_path_change_with_npm_packages?
-      return true unless group.packages_feature_enabled?
-      return true if params[:path].blank?
-      return true if !group.has_parent? && group.path == params[:path]
-
-      npm_packages = ::Packages::GroupPackagesFinder.new(current_user, group, package_type: :npm).execute
-      if npm_packages.exists?
-        group.errors.add(:path, s_('GroupSettings|cannot change when group contains projects with NPM packages'))
-        return
-      end
-
-      true
-    end
-
     def before_assignment_hook(group, params)
       @full_path_before = group.full_path
       @path_before = group.path