Merge branch 'eread/refine-new-inactive-project-content' into 'master'

Refine new inactive project content

See merge request gitlab-org/gitlab!87754

doc/administration/inactive_project_deletion.md

@@ -11,8 +11,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 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.
+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 
@@ -24,37 +23,35 @@ deleted, the action generates an audit event that it was performed by the first
 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.
+- `delete_inactive_projects`: Enable or disable inactive project deletion.
+- `inactive_projects_min_size_mb`: 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.
+- `inactive_projects_delete_after_months`: Minimum duration (months) after which a project is scheduled for deletion if
+  it continues be inactive.
+- `inactive_projects_send_warning_email_after_months`: 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 less than the `inactive_projects_delete_after_months` duration.
 
 For example:
 
-- Delete inactive projects: enabled.
-- Delete inactive projects that exceed: 50.
-- Delete project after: 12.
-- Send warning email: 6.
+- `delete_inactive_projects` enabled.
+- `inactive_projects_min_size_mb` set to `50`.
+- `inactive_projects_delete_after_months` set to `12`.
+- `inactive_projects_send_warning_email_after_months` set to `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 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:
+You can view a project's activities and determine when the project was last active in the following ways:
 
 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.

doc/api/settings.md

@@ -279,7 +279,7 @@ listed in the descriptions of the relevant settings.
 | `default_snippet_visibility`             | string           | no                                   | What visibility level new snippets receive. Can take `private`, `internal` and `public` as a parameter. Default is `private`. |
 | `delayed_project_deletion` **(PREMIUM SELF)** | boolean     | no                                   | Enable delayed project deletion by default in new groups. Default is `false`. |
 | `delayed_group_deletion` **(PREMIUM SELF)**   | boolean     | no                                   | Enable delayed group deletion by default in new groups. Requires both `delayed_group_deletion` to be true and `deletion_adjourned_period` to be greater than 0. Default is `true`. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/352959) in GitLab 15.0. |
-| `delete_inactive_projects`               | boolean          | no                                   | Enable inactive project deletion feature. Default is `false`. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84519) in GitLab 14.10. |
+| `delete_inactive_projects`               | boolean          | no                                   | Enable inactive project deletion feature. Default is `false`. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84519) in GitLab 14.10. [Became operational](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85689) in GitLab 15.0 (with feature flag `inactive_projects_deletion`, disabled by default). |
 | `deletion_adjourned_period` **(PREMIUM SELF)** | integer    | no                                   | The number of days to wait before deleting a project or group that is marked for deletion. Value must be between 0 and 90. On every update, a hook on `deletion_adjourned_period` sets the value of `delayed_group_deletion` to `true` if `deletion_adjourned_period` is greater than 0 and `false` if `deletion_adjourned_period` is 0.
 | `diff_max_patch_bytes`                   | integer          | no                                   | Maximum [diff patch size](../user/admin_area/diff_limits.md), in bytes. |
 | `diff_max_files`                         | integer          | no                                   | Maximum [files in a diff](../user/admin_area/diff_limits.md). |
@@ -356,9 +356,9 @@ listed in the descriptions of the relevant settings.
 | `html_emails_enabled`                    | boolean          | no                                   | Enable HTML emails. |
 | `import_sources`                         | array of strings | no                                   | Sources to allow project import from, possible values: `github`, `bitbucket`, `bitbucket_server`, `gitlab`, `fogbugz`, `git`, `gitlab_project`, `gitea`, `manifest`, and `phabricator`. |
 | `in_product_marketing_emails_enabled`    | boolean          | no                                   | Enable [in-product marketing emails](../user/profile/notifications.md#global-notification-settings). Enabled by default. |
-| `inactive_projects_delete_after_months`  | integer          | no                                   | If `delete_inactive_projects` is `true`, the time (in months) to wait before deleting inactive projects. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84519) in GitLab 14.10. |
-| `inactive_projects_min_size_mb`          | integer          | no                                   | If `delete_inactive_projects` is `true`, the minimum repository size for projects to be checked for inactivity. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84519) in GitLab 14.10. |
-| `inactive_projects_send_warning_email_after_months` | integer | no                                 | If `delete_inactive_projects` is `true`, sets the time (in months) to wait before emailing maintainers that the project will be deleted because it is inactive. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84519) in GitLab 14.10. |
+| `inactive_projects_delete_after_months`  | integer          | no                                   | If `delete_inactive_projects` is `true`, the time (in months) to wait before deleting inactive projects. Default is `2`. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84519) in GitLab 14.10. [Became operational](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85689) in GitLab 15.0. |
+| `inactive_projects_min_size_mb`          | integer          | no                                   | If `delete_inactive_projects` is `true`, the minimum repository size for projects to be checked for inactivity. Default is `0`. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84519) in GitLab 14.10. [Became operational](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85689) in GitLab 15.0. |
+| `inactive_projects_send_warning_email_after_months` | integer | no                                 | If `delete_inactive_projects` is `true`, sets the time (in months) to wait before emailing maintainers that the project is scheduled be deleted because it is inactive. Default is `1`. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/84519) in GitLab 14.10. [Became operational](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85689) in GitLab 15.0. |
 | `invisible_captcha_enabled`              | boolean          | no                                   | Enable Invisible CAPTCHA spam detection during sign-up. Disabled by default. |
 | `issues_create_limit`                    | integer          | no                                   | Max number of issue creation requests per minute per user. Disabled by default.|
 | `keep_latest_artifact`                   | boolean          | no                                   | Prevent the deletion of the artifacts from the most recent successful jobs, regardless of the expiry time. Enabled by default. |