Rename ability 'delayed_project_deletion' to 'delay_project_deletions'

ee/app/controllers/ee/projects_controller.rb

@@ -38,7 +38,7 @@ module EE
 
     override :destroy
     def destroy
-      return super unless can?(current_user, :delayed_project_deletion)
+      return super unless can?(current_user, :delay_project_deletions)
       return super unless project.adjourned_deletion_configured?
       return super if project.marked_for_deletion_at? && params[:permanently_delete].present?
 

ee/app/policies/ee/global_policy.rb

@@ -60,7 +60,7 @@ module EE
 
       rule { adjourned_project_deletion_available }.policy do
         enable :list_removable_projects
-        enable :delayed_project_deletion
+        enable :delay_project_deletions
       end
 
       rule { export_user_permissions_available & admin }.enable :export_user_permissions

ee/app/services/projects/mark_for_deletion_service.rb

@@ -4,7 +4,7 @@ module Projects
   class MarkForDeletionService < BaseService
     def execute
       return success if project.marked_for_deletion_at?
-      return error('Cannot mark project for deletion: feature not supported') unless can?(current_user, :delayed_project_deletion)
+      return error('Cannot mark project for deletion: feature not supported') unless can?(current_user, :delay_project_deletions)
 
       result = ::Projects::UpdateService.new(
         project,

ee/app/views/admin/projects/_archived.html.haml

-- if project.marked_for_deletion_at? && can?(current_user, :delayed_project_deletion)
+- if project.marked_for_deletion_at? && can?(current_user, :delay_project_deletions)
   = gl_badge_tag _('pending deletion'), variant: :warning
 - elsif project.archived
   = gl_badge_tag _('archived'), variant: :warning

ee/app/views/projects/_remove.html.haml

 - return unless can?(current_user, :remove_project, project)
-- can_delayed_project_deletion = can?(current_user, :delayed_project_deletion)
+- can_delay_project_deletions = can?(current_user, :delay_project_deletions)
 - adjourned_deletion = project.adjourned_deletion_configured?
 - adjourned_date = adjourned_deletion ? permanent_deletion_date(Time.now.utc).to_s : nil
 - restore_help_path = help_page_path('user/project/settings/index', anchor: 'restore-a-project')
@@ -10,7 +10,7 @@
 - unless project.marked_for_deletion_at?
   .sub-section
     %h4.danger-title= _('Delete this project')
-    - if adjourned_deletion && can_delayed_project_deletion
+    - if adjourned_deletion && can_delay_project_deletions
       = render 'projects/settings/marked_for_removal'
     - else
       %p= permanent_delete_message(project)

ee/app/views/projects/settings/_marked_for_removal.html.haml

-- return unless can?(current_user, :delayed_project_deletion)
+- return unless can?(current_user, :delay_project_deletions)
 
 %p= marked_for_removal_message(@project)

ee/app/views/shared/projects/_archived.html.haml

-- if project.marked_for_deletion_at && can?(current_user, :delayed_project_deletion)
+- if project.marked_for_deletion_at && can?(current_user, :delay_project_deletions)
   = gl_badge_tag _('pending deletion'), { variant: :warning }, { class: 'gl-display-flex gl-ml-3' }
 - elsif project.archived
   = gl_badge_tag _('archived'), { variant: :warning }, { class: 'gl-display-flex gl-ml-3' }

ee/lib/ee/api/projects.rb

@@ -125,7 +125,7 @@ module EE
 
           override :delete_project
           def delete_project(user_project)
-            return super unless can?(current_user, :delayed_project_deletion)
+            return super unless can?(current_user, :delay_project_deletions)
             return super unless user_project.adjourned_deletion_configured?
 
             result = destroy_conditionally!(user_project) do