Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 4 deletions

diff --git a/app/services/projects/after_rename_service.rb b/app/services/projects/after_rename_service.rb
index e173655ed05..5cd30689faf 100644
--- a/app/services/projects/after_rename_service.rb
+++ b/app/services/projects/after_rename_service.rb
@@ -63,8 +63,7 @@ module Projects
     end
 
     def ensure_registry_tags_can_be_handled
-      return if Feature.enabled?(:renaming_project_with_tags, project) &&
-        ContainerRegistry::GitlabApiClient.supports_gitlab_api?
+      return if ContainerRegistry::GitlabApiClient.supports_gitlab_api?
 
       rename_failed!("Project #{full_path_before} cannot be renamed because images are " \
       "present in its container registry")
diff --git a/app/services/projects/update_service.rb b/app/services/projects/update_service.rb
index cfcbe42997b..1366370527d 100644
--- a/app/services/projects/update_service.rb
+++ b/app/services/projects/update_service.rb
@@ -92,8 +92,7 @@ module Projects
     def validate_renaming_project_with_tags
       return unless renaming_project_with_container_registry_tags?
 
-      unless Feature.enabled?(:renaming_project_with_tags, project) &&
-          ContainerRegistry::GitlabApiClient.supports_gitlab_api?
+      unless ContainerRegistry::GitlabApiClient.supports_gitlab_api?
         raise ValidationError, s_('UpdateProject|Cannot rename project because it contains container registry tags!')
       end