Add latest changes from gitlab-org/gitlab@master

app/models/application_setting.rb

@@ -625,6 +625,7 @@ class ApplicationSetting < ApplicationRecord
   attr_encrypted :recaptcha_private_key, encryption_options_base_32_aes_256_gcm
   attr_encrypted :recaptcha_site_key, encryption_options_base_32_aes_256_gcm
   attr_encrypted :slack_app_secret, encryption_options_base_32_aes_256_gcm
+  attr_encrypted :slack_app_signing_secret, encryption_options_base_32_aes_256_gcm.merge(encode: false, encode_iv: false)
   attr_encrypted :slack_app_verification_token, encryption_options_base_32_aes_256_gcm
   attr_encrypted :ci_jwt_signing_key, encryption_options_base_32_aes_256_gcm
   attr_encrypted :customers_dot_jwt_signing_key, encryption_options_base_32_aes_256_gcm

db/migrate/20220504042847_add_slack_signing_key_to_application_settings.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class AddSlackSigningKeyToApplicationSettings < Gitlab::Database::Migration[2.0]
+  def change
+    add_column :application_settings, :encrypted_slack_app_signing_secret, :binary
+    add_column :application_settings, :encrypted_slack_app_signing_secret_iv, :binary
+  end
+end

db/schema_migrations/20220504042847

@@ -0,0 +1 @@
+cf3c125a0a8e8410abac5aaa68289d9548f77c29c2e46f1e93299fba5ba77a2b

db/structure.sql

@@ -11300,6 +11300,8 @@ CREATE TABLE application_settings (
     delayed_group_deletion boolean DEFAULT true NOT NULL,
     arkose_labs_namespace text DEFAULT 'client'::text NOT NULL,
     max_export_size integer DEFAULT 0,
+    encrypted_slack_app_signing_secret bytea,
+    encrypted_slack_app_signing_secret_iv bytea,
     container_registry_pre_import_timeout integer DEFAULT 1800 NOT NULL,
     container_registry_import_timeout integer DEFAULT 600 NOT NULL,
     pipeline_limit_per_project_user_sha integer DEFAULT 0 NOT NULL,

doc/administration/audit_events.md

@@ -185,6 +185,7 @@ From there, you can see the following actions:
 - Merge commit message template is updated ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/355805) in GitLab 15.0)
 - Squash commit message template is updated ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/355805) in GitLab 15.0)
 - Default description template for merge requests is updated ([introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/355805) in GitLab 15.0)
+- Project was scheduled for deletion due to inactivity ([introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85689) in GitLab 15.0)
 
 Project events can also be accessed via the [Project Audit Events API](../api/audit_events.md#project-audit-events).
 

doc/administration/inactive_project_deletion.md

@@ -0,0 +1,63 @@
+---
+stage: Manage
+group: Compliance
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
+---
+
+# Inactive project deletion **(FREE SELF)**
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85689) in GitLab 15.0 [with a flag](../administration/feature_flags.md) named `inactive_projects_deletion`. Disabled by default.
+
+FLAG:
+On self-managed GitLab, by default this feature is not available. To make it available, ask an administrator to 
+[enable the feature flag](../administration/feature_flags.md) named `inactive_projects_deletion`.
+On GitLab.com, this feature is not available.
+This feature is not ready for production use.
+
+Administrators of large GitLab instances can find that over time, projects become inactive and are no longer used.
+These projects take up unnecessary disk space. With inactive project deletion, you can identify these projects, warn 
+the maintainers ahead of time, and then delete the projects if they remain inactive. When an inactive project is 
+deleted, the action generates an audit event that it was performed by the first active administrator.
+
+## Configure inactive project deletion
+
+You can configure inactive projects deletion or turn it off using the
+[Application settings API](../api/settings.md#change-application-settings).
+
+## Inactive project deletion options
+
+The following options are available:
+
+- **Delete inactive projects**: Enable or disable inactive project deletion.
+- **Delete inactive projects that exceed**: Minimum size (MB) of inactive projects to be considered for deletion.
+  Projects smaller in size than this threshold aren't considered inactive.
+- **Delete project after**: Minimum duration (months) after which a project is scheduled for deletion if it continues 
+be inactive.
+- **Send warning email**: Minimum duration (months) after which a deletion warning email is sent if a project continues
+to be inactive. The warning email is sent to users with the Owner and Maintainer roles of the inactive project.
+This duration should be greater than the **Delete project after** duration.
+
+For example:
+
+- Delete inactive projects: enabled.
+- Delete inactive projects that exceed: 50.
+- Delete project after: 12.
+- Send warning email: 6.
+
+In this scenario, when a project's size is:
+
+- Less than 50 MB, the project is not considered inactive.
+- Greater than 50 MB and it is inactive for:
+  - More than 6 months, a deletion warning is email is sent to users with the Owner and Maintainer role on the project 
+with the scheduled date of deletion.
+  - More than 12 months, the project is scheduled for deletion.
+
+## Determine when a project was last active
+
+There are several ways to view the project's activities and determine when project was last active:
+
+1. Go to the [activity page](../user/project/working_with_projects.md#view-project-activity) for the project and view
+   the date of the latest event.
+1. View the `last_activity_at` attribute for the project using the [Projects API](../api/projects.md).
+1. List the visible events for the project using the [Events API](../api/events.md#list-a-projects-visible-events).
+   View the `created_at` attribute of the latest event.

doc/api/settings.md

@@ -429,6 +429,7 @@ listed in the descriptions of the relevant settings.
 | `slack_app_enabled` **(PREMIUM)**        | boolean          | no                                   | (**If enabled, requires:** `slack_app_id`, `slack_app_secret` and `slack_app_secret`) Enable Slack app. |
 | `slack_app_id` **(PREMIUM)**             | string           | required by: `slack_app_enabled`     | The app ID of the Slack-app. |
 | `slack_app_secret` **(PREMIUM)**         | string           | required by: `slack_app_enabled`     | The app secret of the Slack-app. |
+| `slack_app_signing_secret` **(PREMIUM)** | string           | no                                   | The signing secret of the Slack-app. |
 | `slack_app_verification_token` **(PREMIUM)** | string       | required by: `slack_app_enabled`     | The verification token of the Slack-app. |
 | `snippet_size_limit`                     | integer          | no                                   | Max snippet content size in **bytes**. Default: 52428800 Bytes (50MB).|
 | `snowplow_app_id`                        | string           | no                                   | The Snowplow site name / application ID. (for example, `gitlab`) |

doc/user/admin_area/settings/index.md

@@ -177,8 +177,10 @@ The **Repository** settings contain:
 - Repository maintenance:
   - [Repository checks](../../../administration/repository_checks.md) - Configure
     automatic Git checks on repositories.
-  - [Housekeeping](../../../administration/housekeeping.md)). Configure automatic
+  - [Housekeeping](../../../administration/housekeeping.md). Configure automatic
     Git housekeeping on repositories.
+  - [Inactive project deletion](../../../administration/inactive_project_deletion.md). Configure inactive
+    project deletion.
 - [Repository static objects](../../../administration/static_objects_external_storage.md) -
   Serve repository static objects (for example, archives and blobs) from an external storage (for example, a CDN).
 

doc/user/gitlab_com/index.md

@@ -99,6 +99,10 @@ If you are on:
 - Premium tier and above, you can disable this by changing the [group setting](../group/index.md#enable-delayed-project-deletion).
 - Free tier, you cannot disable this setting or restore projects.
 
+## Inactive project deletion
+
+[Inactive project deletion](../../administration/inactive_project_deletion.md) is disabled on GitLab.com.
+
 ## Alternative SSH port
 
 GitLab.com can be reached by using a [different SSH port](https://about.gitlab.com/blog/2016/02/18/gitlab-dot-com-now-supports-an-alternate-git-plus-ssh-port/) for `git+ssh`.

doc/user/project/merge_requests/code_quality.md

@@ -72,7 +72,7 @@ This example shows how to run Code Quality on your code by using GitLab CI/CD an
 
 In either configuration, the runner must have enough disk space to handle generated Code Quality files. For example on the [GitLab project](https://gitlab.com/gitlab-org/gitlab) the files are approximately 7 GB.
 
-Once you set up GitLab Runner, include the Code Quality template in your CI configuration:
+Once you set up GitLab Runner, include the [Code Quality template](https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Jobs/Code-Quality.gitlab-ci.yml) in your CI configuration:
 
 ```yaml
 include:

locale/gitlab.pot

@@ -35283,6 +35283,9 @@ msgstr ""
 msgid "SlackIntegration|Sends notifications about project events to Slack channels."
 msgstr ""
 
+msgid "SlackIntegration|Signing Secret"
+msgstr ""
+
 msgid "SlackIntegration|Team name"
 msgstr ""