Merge branch '223013-rename-project-adjourned-as-delayed' into 'master'

Rename project delete "adjourned" and "soft deleted" as "delayed"

Closes #223013

See merge request gitlab-org/gitlab!38921

doc/api/groups.md

@@ -847,7 +847,7 @@ Only available to group owners and administrators.
 This endpoint either:
 
 - Removes group, and queues a background job to delete all projects in the group as well.
-- Since [GitLab 12.8](https://gitlab.com/gitlab-org/gitlab/-/issues/33257), on [Premium or Silver](https://about.gitlab.com/pricing/) or higher tiers, marks a group for deletion. The deletion will happen 7 days later by default, but this can be changed in the [instance settings](../user/admin_area/settings/visibility_and_access_controls.md#default-deletion-adjourned-period-premium-only).
+- Since [GitLab 12.8](https://gitlab.com/gitlab-org/gitlab/-/issues/33257), on [Premium or Silver](https://about.gitlab.com/pricing/) or higher tiers, marks a group for deletion. The deletion will happen 7 days later by default, but this can be changed in the [instance settings](../user/admin_area/settings/visibility_and_access_controls.md#default-deletion-delay-premium-only).
 
 ```plaintext
 DELETE /groups/:id

doc/api/projects.md

@@ -1841,7 +1841,7 @@ This endpoint:
 group admins can [configure](../user/group/index.md#enabling-delayed-project-removal-premium) projects within a group
 to be deleted after a delayed period.
 When enabled, actual deletion happens after the number of days
-specified in the [default deletion period](../user/admin_area/settings/visibility_and_access_controls.md#default-deletion-adjourned-period-premium-only).
+specified in the [default deletion delay](../user/admin_area/settings/visibility_and_access_controls.md#default-deletion-delay-premium-only).
 
 CAUTION: **Warning:**
 The default behavior of [Delayed Project deletion](https://gitlab.com/gitlab-org/gitlab/-/issues/32935) in GitLab 12.6

doc/user/admin_area/settings/visibility_and_access_controls.md

@@ -67,7 +67,7 @@ To ensure only admin users can delete projects:
 1. Check the **Default project deletion protection** checkbox.
 1. Click **Save changes**.
 
-## Default deletion adjourned period **(PREMIUM ONLY)**
+## Default deletion delay **(PREMIUM ONLY)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/32935) in GitLab 12.6.
 
@@ -88,7 +88,7 @@ To change this period:
 1. Select the desired option.
 1. Click **Save changes**.
 
-### Override default deletion adjourned period
+### Override default deletion delayed period
 
 Alternatively, projects that are marked for removal can be deleted immediately. To do so:
 

doc/user/group/index.md

@@ -480,7 +480,7 @@ To remove a group and its contents:
 This action either:
 
 - Removes the group, and also queues a background job to delete all projects in that group.
-- Since [GitLab 12.8](https://gitlab.com/gitlab-org/gitlab/-/issues/33257), on [Premium or Silver](https://about.gitlab.com/pricing/premium/) or higher tiers, marks a group for deletion. The deletion will happen 7 days later by default, but this can be changed in the [instance settings](../admin_area/settings/visibility_and_access_controls.md#default-deletion-adjourned-period-premium-only).
+- Since [GitLab 12.8](https://gitlab.com/gitlab-org/gitlab/-/issues/33257), on [Premium or Silver](https://about.gitlab.com/pricing/premium/) or higher tiers, marks a group for deletion. The deletion will happen 7 days later by default, but this can be changed in the [instance settings](../admin_area/settings/visibility_and_access_controls.md#default-deletion-delay-premium-only).
 
 ### Restore a group **(PREMIUM)**
 
@@ -660,7 +660,7 @@ Optionally, on [Premium or Silver](https://about.gitlab.com/pricing/) or higher
 you can configure the projects within a group to be deleted after a delayed interval.
 
 During this interval period, the projects will be in a read-only state and can be restored, if required.
-The interval period defaults to 7 days, and can be modified by an admin in the [instance settings](../admin_area/settings/visibility_and_access_controls.md#default-deletion-adjourned-period-premium-only).
+The interval period defaults to 7 days, and can be modified by an admin in the [instance settings](../admin_area/settings/visibility_and_access_controls.md#default-deletion-delay-premium-only).
 
 To enable delayed deletion of projects:
 

doc/user/project/index.md

@@ -193,7 +193,7 @@ To remove a project, first navigate to the home page for that project.
 ### Delayed removal **(PREMIUM)**
 
 By default, clicking to remove a project is followed by a seven day delay. Admins can restore the project during this period of time.
-This delay [may be changed by an admin](../admin_area/settings/visibility_and_access_controls.md#default-deletion-adjourned-period-premium-only).
+This delay [may be changed by an admin](../admin_area/settings/visibility_and_access_controls.md#default-deletion-delay-premium-only).
 
 Admins can view all projects pending deletion. If you're an administrator, go to the top navigation bar, click **Projects > Your projects**, and then select the **Removed projects** tab.
 From this tab an admin can restore any project.

doc/user/project/settings/index.md

@@ -237,7 +237,7 @@ This action:
 group admins can [configure](../../group/index.md#enabling-delayed-project-removal-premium) projects within a group
 to be deleted after a delayed period.
 When enabled, actual deletion happens after number of days
-specified in [instance settings](../../admin_area/settings/visibility_and_access_controls.md#default-deletion-adjourned-period-premium-only).
+specified in [instance settings](../../admin_area/settings/visibility_and_access_controls.md#default-deletion-delay-premium-only).
 
 CAUTION: **Warning:**
 The default behavior of [Delayed Project deletion](https://gitlab.com/gitlab-org/gitlab/-/issues/32935) in GitLab 12.6 was changed to

ee/app/views/admin/application_settings/_default_project_deletion_adjourned_period_setting.html.haml

@@ -3,7 +3,7 @@
 - f = local_assigns.fetch(:form)
 
 .form-group
-  = f.label s_('Default deletion adjourned period'), class: 'label-bold'
+  = f.label s_('Default deletion delay'), class: 'label-bold'
   = f.select :deletion_adjourned_period, options_for_select(0..90, @application_setting.deletion_adjourned_period), {}, class: 'form-control'
   = f.label :deletion_adjourned_period, class: 'form-check-label' do
     = _('How many days need to pass between marking entity for deletion and actual removing it.')

ee/app/views/groups/settings/_delayed_project_removal.html.haml

@@ -5,4 +5,4 @@
     = f.check_box :delayed_project_removal, checked: group.delayed_project_removal?, class: 'form-check-input'
     = f.label :delayed_project_removal, class: 'form-check-label' do
       %span.gl-display-block= s_('GroupSettings|Enable delayed project removal')
-      %span.gl-text-gray-400= s_('GroupSettings|Projects will be permanently deleted after a %{waiting_period}-day waiting period. This period can be %{customization_link} in instance settings').html_safe % { waiting_period: ::Gitlab::CurrentSettings.deletion_adjourned_period, customization_link: link_to('customized by an admin', general_admin_application_settings_path) }
+      %span.gl-text-gray-400= s_('GroupSettings|Projects will be permanently deleted after a %{waiting_period}-day delay. This delay can be %{customization_link} in instance settings').html_safe % { waiting_period: ::Gitlab::CurrentSettings.deletion_adjourned_period, customization_link: link_to('customized by an admin', general_admin_application_settings_path) }

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

 - return unless can?(current_user, :remove_project, project)
 - adjourned_deletion = project.adjourned_deletion?
 - adjourned_date = adjourned_deletion ? permanent_deletion_date(Time.now.utc).to_s : nil;
-- admin_help_path = help_page_path('user/admin_area/settings/visibility_and_access_controls', anchor: 'default-deletion-adjourned-period-premium-only')
+- admin_help_path = help_page_path('user/admin_area/settings/visibility_and_access_controls', anchor: 'default-deletion-delay-premium-only')
 - recovery_help_path = help_page_path('user/project/settings/index', anchor: 'remove-a-project')
 - confirm_phrase = s_('DeleteProject|Delete %{name}') % { name: project.full_name }
 

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

@@ -2,5 +2,5 @@
 
 %p
   %span.gl-text-gray-500= _('Projects will be permanently deleted after a 7-day waiting period.')
-  = link_to(_('Customizable by an administrator.'), help_page_path('user/admin_area/settings/visibility_and_access_controls', anchor: 'default-deletion-adjourned-period-premium-only'))
+  = link_to(_('Customizable by an administrator.'), help_page_path('user/admin_area/settings/visibility_and_access_controls', anchor: 'default-deletion-delay-premium-only'))
 %p= marked_for_removal_message(@project)

ee/changelogs/unreleased/223013-rename-project-adjourned-as-delayed.yml

+---
+title: Rename project delete 'adjourned' and 'soft deleted' to 'delayed'
+merge_request: 38921
+author:
+type: changed

ee/spec/controllers/admin/application_settings_controller_spec.rb

@@ -143,7 +143,7 @@ RSpec.describe Admin::ApplicationSettingsController do
       it_behaves_like 'settings for licensed features'
     end
 
-    context 'project deletion adjourned period' do
+    context 'project deletion delay' do
       let(:settings) { { deletion_adjourned_period: 6 } }
       let(:feature) { :adjourned_deletion_for_projects_and_groups }
 

ee/spec/controllers/ee/groups_controller_spec.rb

@@ -94,7 +94,7 @@ RSpec.describe GroupsController do
         sign_in(user)
       end
 
-      context 'adjourned deletion feature is available' do
+      context 'delayed deletion feature is available' do
         before do
           stub_licensed_features(adjourned_deletion_for_projects_and_groups: true)
         end
@@ -130,7 +130,7 @@ RSpec.describe GroupsController do
         end
       end
 
-      context 'adjourned deletion feature is not available' do
+      context 'delayed deletion feature is not available' do
         before do
           stub_licensed_features(adjourned_deletion_for_projects_and_groups: false)
         end
@@ -168,13 +168,13 @@ RSpec.describe GroupsController do
         sign_in(user)
       end
 
-      context 'adjourned deletion feature is available' do
+      context 'delayed deletion feature is available' do
         before do
           stub_licensed_features(adjourned_deletion_for_projects_and_groups: true)
         end
 
         context 'success' do
-          it 'marks the group for adjourned deletion' do
+          it 'marks the group for delayed deletion' do
             expect { subject }.to change { group.reload.marked_for_deletion? }.from(false).to(true)
           end
 
@@ -184,7 +184,7 @@ RSpec.describe GroupsController do
             end
           end
 
-          it 'redirects to group path with notice about adjourned deletion' do
+          it 'redirects to group path with notice about delayed deletion' do
             subject
 
             expect(response).to redirect_to(group_path(group))
@@ -210,7 +210,7 @@ RSpec.describe GroupsController do
         end
       end
 
-      context 'adjourned deletion feature is not available' do
+      context 'delayed deletion feature is not available' do
         before do
           stub_licensed_features(adjourned_deletion_for_projects_and_groups: false)
         end

ee/spec/helpers/ee/groups_helper_spec.rb

@@ -104,17 +104,17 @@ RSpec.describe GroupsHelper do
   describe '#remove_group_message' do
     subject { helper.remove_group_message(group) }
 
-    context 'adjourned deletion feature is available' do
+    context 'delayed deletion feature is available' do
       before do
         stub_licensed_features(adjourned_deletion_for_projects_and_groups: true)
       end
 
-      it 'returns the message related to adjourned deletion' do
+      it 'returns the message related to delayed deletion' do
         expect(subject).to include("The contents of this group, its subgroups and projects will be permanently removed after")
       end
     end
 
-    context 'adjourned deletion feature is not available' do
+    context 'delayed deletion feature is not available' do
       before do
         stub_licensed_features(adjourned_deletion_for_projects_and_groups: false)
       end

ee/spec/helpers/projects_helper_spec.rb

@@ -270,7 +270,7 @@ RSpec.describe ProjectsHelper do
       allow(project).to receive(:adjourned_deletion?).and_return(enabled)
     end
 
-    context 'when project has adjourned deletion enabled' do
+    context 'when project has delayed deletion enabled' do
       let(:enabled) { true }
 
       it do
@@ -280,7 +280,7 @@ RSpec.describe ProjectsHelper do
       end
     end
 
-    context 'when project has adjourned deletion disabled' do
+    context 'when project has delayed deletion disabled' do
       let(:enabled) { false }
 
       it do

ee/spec/models/ee/description_version_spec.rb

@@ -62,7 +62,7 @@ RSpec.describe DescriptionVersion do
     end
 
     context 'when start_id is not present' do
-      it 'only soft deletes description_version' do
+      it 'only delayed deletes description_version' do
         version = epic.description_versions.last
 
         version.delete!
@@ -73,7 +73,7 @@ RSpec.describe DescriptionVersion do
     end
 
     context 'when start_id is present' do
-      it 'soft deletes description versions of same issuable up to start_id' do
+      it 'delayed deletes description versions of same issuable up to start_id' do
         description_version = epic.description_versions.last.previous_version
         starting_version = epic.description_versions.second
 

ee/spec/models/group_spec.rb

@@ -768,7 +768,7 @@ RSpec.describe Group do
   end
 
   describe '#self_or_ancestor_marked_for_deletion' do
-    context 'adjourned deletion feature is not available' do
+    context 'delayed deletion feature is not available' do
       before do
         stub_licensed_features(adjourned_deletion_for_projects_and_groups: false)
         create(:group_deletion_schedule, group: group, marked_for_deletion_on: 1.day.ago)
@@ -779,7 +779,7 @@ RSpec.describe Group do
       end
     end
 
-    context 'adjourned deletion feature is available' do
+    context 'delayed deletion feature is available' do
       before do
         stub_licensed_features(adjourned_deletion_for_projects_and_groups: true)
       end
@@ -827,12 +827,12 @@ RSpec.describe Group do
   describe '#marked_for_deletion?' do
     subject { group.marked_for_deletion? }
 
-    context 'adjourned deletion feature is available' do
+    context 'delayed deletion feature is available' do
       before do
         stub_licensed_features(adjourned_deletion_for_projects_and_groups: true)
       end
 
-      context 'when the group is marked for adjourned deletion' do
+      context 'when the group is marked for delayed deletion' do
         before do
           create(:group_deletion_schedule, group: group, marked_for_deletion_on: 1.day.ago)
         end
@@ -840,17 +840,17 @@ RSpec.describe Group do
         it { is_expected.to be_truthy }
       end
 
-      context 'when the group is not marked for adjourned deletion' do
+      context 'when the group is not marked for delayed deletion' do
         it { is_expected.to be_falsey }
       end
     end
 
-    context 'adjourned deletion feature is not available' do
+    context 'delayed deletion feature is not available' do
       before do
         stub_licensed_features(adjourned_deletion_for_projects_and_groups: false)
       end
 
-      context 'when the group is marked for adjourned deletion' do
+      context 'when the group is marked for delayed deletion' do
         before do
           create(:group_deletion_schedule, group: group, marked_for_deletion_on: 1.day.ago)
         end
@@ -858,7 +858,7 @@ RSpec.describe Group do
         it { is_expected.to be_falsey }
       end
 
-      context 'when the group is not marked for adjourned deletion' do
+      context 'when the group is not marked for delayed deletion' do
         it { is_expected.to be_falsey }
       end
     end
@@ -875,12 +875,12 @@ RSpec.describe Group do
       it { is_expected.to be_truthy }
     end
 
-    context 'adjourned deletion feature is available' do
+    context 'delayed deletion feature is available' do
       before do
         stub_licensed_features(adjourned_deletion_for_projects_and_groups: true)
       end
 
-      context 'when adjourned deletion period is set to more than 0' do
+      context 'when delayed deletion period is set to more than 0' do
         before do
           stub_application_setting(deletion_adjourned_period: 1)
         end
@@ -888,7 +888,7 @@ RSpec.describe Group do
         it_behaves_like 'returns true'
       end
 
-      context 'when adjourned deletion period is set to 0' do
+      context 'when delayed deletion period is set to 0' do
         before do
           stub_application_setting(deletion_adjourned_period: 0)
         end
@@ -897,12 +897,12 @@ RSpec.describe Group do
       end
     end
 
-    context 'adjourned deletion feature is not available' do
+    context 'delayed deletion feature is not available' do
       before do
         stub_licensed_features(adjourned_deletion_for_projects_and_groups: false)
       end
 
-      context 'when adjourned deletion period is set to more than 0' do
+      context 'when delayed deletion period is set to more than 0' do
         before do
           stub_application_setting(deletion_adjourned_period: 1)
         end
@@ -910,7 +910,7 @@ RSpec.describe Group do
         it_behaves_like 'returns false'
       end
 
-      context 'when adjourned deletion period is set to 0' do
+      context 'when delayed deletion period is set to 0' do
         before do
           stub_application_setting(deletion_adjourned_period: 0)
         end

ee/spec/models/project_spec.rb

@@ -2369,7 +2369,7 @@ RSpec.describe Project do
   end
 
   describe '#ancestor_marked_for_deletion' do
-    context 'adjourned deletion feature is not available' do
+    context 'delayed deletion feature is not available' do
       before do
         stub_licensed_features(adjourned_deletion_for_projects_and_groups: false)
       end
@@ -2387,7 +2387,7 @@ RSpec.describe Project do
       end
     end
 
-    context 'adjourned deletion feature is available' do
+    context 'delayed deletion feature is available' do
       before do
         stub_licensed_features(adjourned_deletion_for_projects_and_groups: true)
       end

ee/spec/requests/api/groups_spec.rb

@@ -690,13 +690,13 @@ RSpec.describe API::Groups do
         stub_licensed_features(adjourned_deletion_for_projects_and_groups: true)
       end
 
-      context 'period for adjourned deletion is greater than 0' do
+      context 'period for delayed deletion is greater than 0' do
         before do
           stub_application_setting(deletion_adjourned_period: 1)
         end
 
         context 'success' do
-          it 'marks the group for adjourned deletion' do
+          it 'marks the group for delayed deletion' do
             subject
             group.reload
 
@@ -724,7 +724,7 @@ RSpec.describe API::Groups do
         end
       end
 
-      context 'period of adjourned deletion is set to 0' do
+      context 'period of delayed deletion is set to 0' do
         before do
           stub_application_setting(deletion_adjourned_period: 0)
         end

ee/spec/requests/api/settings_spec.rb

@@ -150,7 +150,7 @@ RSpec.describe API::Settings, 'EE Settings' do
     it_behaves_like 'settings for licensed features'
   end
 
-  context 'deletion adjourned period' do
+  context 'delayed deletion period' do
     let(:settings) { { deletion_adjourned_period: 5 } }
     let(:feature) { :adjourned_deletion_for_projects_and_groups }
 

ee/spec/services/groups/mark_for_deletion_service_spec.rb

@@ -54,7 +54,7 @@ RSpec.describe Groups::MarkForDeletionService do
                  deleting_user: user)
         end
 
-        it 'does not change the attributes associated with adjourned deletion' do
+        it 'does not change the attributes associated with delayed deletion' do
           subject
 
           expect(group.marked_for_deletion_on).to eq(deletion_date.to_date)

ee/spec/services/groups/restore_service_spec.rb

@@ -50,7 +50,7 @@ RSpec.describe Groups::RestoreService do
       context 'for a group that has not been marked for deletion' do
         let(:group) { create(:group) }
 
-        it 'does not change the attributes associated with adjourned deletion' do
+        it 'does not change the attributes associated with delayed deletion' do
           subject
 
           expect(group.marked_for_deletion_on).to be_nil

ee/spec/services/projects/mark_for_deletion_service_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Projects::MarkForDeletionService do
       marked_for_deletion_at: marked_for_deletion_at)
   end
 
-  context 'with soft-delete feature turned on' do
+  context 'with delayed delete feature turned on' do
     before do
       stub_licensed_features(adjourned_deletion_for_projects_and_groups: true)
     end
@@ -48,7 +48,7 @@ RSpec.describe Projects::MarkForDeletionService do
     end
   end
 
-  context 'with soft-delete feature turned off' do
+  context 'with delayed delete feature turned off' do
     context 'marking project for deletion' do
       before do
         described_class.new(project, user).execute

locale/gitlab.pot

@@ -7722,7 +7722,7 @@ msgstr ""
 msgid "Default classification label"
 msgstr ""
 
-msgid "Default deletion adjourned period"
+msgid "Default deletion delay"
 msgstr ""
 
 msgid "Default description template for issues"
@@ -12139,7 +12139,7 @@ msgstr ""
 msgid "GroupSettings|Prevent sharing a project within %{group} with other groups"
 msgstr ""
 
-msgid "GroupSettings|Projects will be permanently deleted after a %{waiting_period}-day waiting period. This period can be %{customization_link} in instance settings"
+msgid "GroupSettings|Projects will be permanently deleted after a %{waiting_period}-day delay. This delay can be %{customization_link} in instance settings"
 msgstr ""
 
 msgid "GroupSettings|Select a sub-group as the custom project template source for this group."