Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.rubocop_todo/layout/line_continuation_spacing.yml

@@ -2,7 +2,6 @@
 # Cop supports --autocorrect.
 Layout/LineContinuationSpacing:
   Exclude:
-    - 'app/helpers/application_settings_helper.rb'
     - 'app/helpers/projects_helper.rb'
     - 'app/helpers/tags_helper.rb'
     - 'app/helpers/tree_helper.rb'

.rubocop_todo/rspec/multiple_memoized_helpers.yml

@@ -25,6 +25,7 @@ RSpec/MultipleMemoizedHelpers:
     - 'spec/requests/api/issues/issues_spec.rb'
     - 'spec/requests/api/issues/put_projects_issues_spec.rb'
     - 'spec/requests/api/maven_packages_spec.rb'
+    - 'spec/requests/api/todos_spec.rb'
     - 'spec/requests/api/users_spec.rb'
     - 'spec/services/boards/issues/list_service_spec.rb'
     - 'spec/services/labels/promote_service_spec.rb'

app/graphql/mutations/work_items/bulk_update.rb

@@ -33,10 +33,6 @@ class BulkUpdate < BaseMutation
         description: 'Number of work items that were successfully updated.'
 
       def ready?(**args)
-        if Feature.disabled?(:bulk_update_work_items_mutation, parent_for!(args[:parent_id]))
-          raise_resource_not_available_error!('`bulk_update_work_items_mutation` feature flag is disabled.')
-        end
-
         if args[:ids].size > MAX_WORK_ITEMS
           raise Gitlab::Graphql::Errors::ArgumentError,
             format(

app/helpers/application_settings_helper.rb

@@ -193,7 +193,7 @@ def repository_storages_options_json
   end
 
   def external_authorization_description
-    s_("ExternalAuthorization|Access to projects is validated on an external service "\
+    s_("ExternalAuthorization|Access to projects is validated on an external service " \
       "using their classification label.")
   end
 
@@ -202,39 +202,39 @@ def external_authorization_allow_token_help_text
   end
 
   def external_authorization_timeout_help_text
-    s_("ExternalAuthorization|Period GitLab waits for a response from the external "\
+    s_("ExternalAuthorization|Period GitLab waits for a response from the external " \
       "service. If there is no response, access is denied. Default: 0.5 seconds.")
   end
 
   def external_authorization_url_help_text
-    s_("ExternalAuthorization|URL to which the projects make authorization requests. If the URL is blank, cross-project "\
-      "features are available and can still specify classification "\
+    s_("ExternalAuthorization|URL to which the projects make authorization requests. If the URL is blank, cross-project " \
+      "features are available and can still specify classification " \
       "labels for projects.")
   end
 
   def external_authorization_client_certificate_help_text
-    s_("ExternalAuthorization|Certificate used to authenticate with the external authorization service. "\
+    s_("ExternalAuthorization|Certificate used to authenticate with the external authorization service. " \
       "If blank, the server certificate is validated when accessing over HTTPS.")
   end
 
   def external_authorization_client_key_help_text
-    s_("ExternalAuthorization|Private key of client authentication certificate. "\
+    s_("ExternalAuthorization|Private key of client authentication certificate. " \
       "Encrypted when stored.")
   end
 
   def external_authorization_client_pass_help_text
-    s_("ExternalAuthorization|Passphrase required to decrypt the private key. "\
+    s_("ExternalAuthorization|Passphrase required to decrypt the private key. " \
       "Encrypted when stored.")
   end
 
   def external_authorization_client_url_help_text
-    s_("ExternalAuthorization|Classification label to use when requesting authorization if no specific "\
+    s_("ExternalAuthorization|Classification label to use when requesting authorization if no specific " \
       "label is defined on the project.")
   end
 
   def sidekiq_job_limiter_mode_help_text
-    _("How the job limiter handles jobs exceeding the thresholds specified below. "\
-      "The 'track' mode only logs the jobs. The 'compress' mode compresses the jobs and "\
+    _("How the job limiter handles jobs exceeding the thresholds specified below. " \
+      "The 'track' mode only logs the jobs. The 'compress' mode compresses the jobs and " \
       "raises an exception if the compressed size exceeds the limit.")
   end
 

app/helpers/groups_helper.rb

@@ -86,14 +86,22 @@ def group_confirm_modal_data(group:, remove_form_id: nil, permanently_remove: fa
     }
   end
 
-  # Overridden in EE
   def remove_group_message(group, permanently_remove)
+    return permanently_delete_group_message(group) if permanently_remove
+    return permanently_delete_group_message(group) unless group.adjourned_deletion?
+    return permanently_delete_group_message(group) if group.marked_for_deletion?
+
+    date = permanent_deletion_date_formatted(Date.current)
+
+    _("The contents of this group, its subgroups and projects will be permanently deleted after %{deletion_adjourned_period} days on %{date}. After this point, your data cannot be recovered.") %
+      { date: date, deletion_adjourned_period: group.deletion_adjourned_period }
+  end
+
+  def permanently_delete_group_message(group)
     content = ''.html_safe
     content << content_tag(:span, format(_("You are about to delete the group %{group_name}."), group_name: group.name))
-
     additional_content = additional_removed_items(group)
     content << additional_content if additional_content.present?
-
     content << remove_group_warning
   end
 

app/mailers/emails/groups.rb

@@ -2,6 +2,8 @@
 
 module Emails
   module Groups
+    include NamespacesHelper
+
     def group_was_exported_email(current_user, group)
       group_email(current_user, group, _('Group was exported'))
     end
@@ -15,6 +17,18 @@ def group_email(current_user, group, subj, errors: nil)
       @errors = errors
       mail_with_locale(to: current_user.notification_email_for(@group), subject: subject(subj))
     end
+
+    def group_scheduled_for_deletion(recipient_id, group_id)
+      @group = ::Group.find(group_id)
+      @user = ::User.find(recipient_id)
+      @deletion_due_in_days = ::Gitlab::CurrentSettings.deletion_adjourned_period.days
+      @deletion_date = permanent_deletion_date_formatted(@group.marked_for_deletion_on, format: '%B %-d, %Y')
+
+      email_with_layout(
+        to: @user.email,
+        subject: subject('Group scheduled for deletion')
+      )
+    end
   end
 end
 

app/mailers/previews/notify_preview.rb

@@ -443,6 +443,17 @@ def project_scheduled_for_deletion
     end
   end
 
+  def group_scheduled_for_deletion
+    cleanup do
+      group.create_deletion_schedule!(
+        marked_for_deletion_on: Time.current,
+        deleting_user: user
+      )
+
+      ::Notify.group_scheduled_for_deletion(user.id, group.id).message
+    end
+  end
+
   private
 
   def project

app/services/groups/mark_for_deletion_service.rb

@@ -18,8 +18,12 @@ def execute(licensed: false)
 
     private
 
-    # overridden in EE
-    def send_group_deletion_notification; end
+    def send_group_deletion_notification
+      return unless ::Feature.enabled?(:group_deletion_notification_email, group) &&
+        group.adjourned_deletion?
+
+      ::NotificationService.new.group_scheduled_for_deletion(group)
+    end
 
     def create_deletion_schedule
       deletion_schedule = group.build_deletion_schedule(deletion_schedule_params)

app/services/notification_service.rb

@@ -801,6 +801,19 @@ def project_scheduled_for_deletion(project)
     end
   end
 
+  def group_scheduled_for_deletion(group)
+    return if group.emails_disabled?
+
+    recipients = group.members.active_without_invites_and_requests.owners.map(&:user)
+
+    recipients.each do |recipient|
+      mailer.group_scheduled_for_deletion(
+        recipient.id,
+        group.id
+      ).deliver_later
+    end
+  end
+
   protected
 
   def new_resource_email(target, current_user, method)

app/services/projects/mark_for_deletion_service.rb

@@ -29,9 +29,7 @@ def execute(licensed: false)
     private
 
     def send_project_deletion_notification
-      return unless ::Feature.enabled?(:project_deletion_notification_email, project) &&
-        project.adjourned_deletion? &&
-        project.marked_for_deletion?
+      return unless project.adjourned_deletion? && project.marked_for_deletion?
 
       ::NotificationService.new.project_scheduled_for_deletion(project)
     end