Commit 11914a22 authored by Suzanne Selhorn's avatar Suzanne Selhorn Committed by Vitaly Slobodin

More edits for style

Related to: https://gitlab.com/gitlab-org/gitlab/-/issues/300312
parent 4a89c574
...@@ -1890,7 +1890,7 @@ This endpoint: ...@@ -1890,7 +1890,7 @@ This endpoint:
merge requests). merge requests).
- From [GitLab 13.2](https://gitlab.com/gitlab-org/gitlab/-/issues/220382) on - From [GitLab 13.2](https://gitlab.com/gitlab-org/gitlab/-/issues/220382) on
[Premium or higher](https://about.gitlab.com/pricing/) tiers, group [Premium or higher](https://about.gitlab.com/pricing/) tiers, group
admins can [configure](../user/group/index.md#enabling-delayed-project-removal) admins can [configure](../user/group/index.md#enable-delayed-project-removal)
projects within a group to be deleted after a delayed period. When enabled, projects within a group to be deleted after a delayed period. When enabled,
actual deletion happens after the number of days specified in the actual deletion happens after the number of days specified in the
[default deletion delay](../user/admin_area/settings/visibility_and_access_controls.md#default-deletion-delay). [default deletion delay](../user/admin_area/settings/visibility_and_access_controls.md#default-deletion-delay).
...@@ -1898,7 +1898,7 @@ This endpoint: ...@@ -1898,7 +1898,7 @@ This endpoint:
WARNING: WARNING:
The default behavior of [Delayed Project deletion](https://gitlab.com/gitlab-org/gitlab/-/issues/32935) The default behavior of [Delayed Project deletion](https://gitlab.com/gitlab-org/gitlab/-/issues/32935)
in GitLab 12.6 was changed to [Immediate deletion](https://gitlab.com/gitlab-org/gitlab/-/issues/220382) in GitLab 12.6 was changed to [Immediate deletion](https://gitlab.com/gitlab-org/gitlab/-/issues/220382)
in GitLab 13.2, as discussed in [Enabling delayed project removal](../user/group/index.md#enabling-delayed-project-removal). in GitLab 13.2, as discussed in [Enable delayed project removal](../user/group/index.md#enable-delayed-project-removal).
```plaintext ```plaintext
DELETE /projects/:id DELETE /projects/:id
......
...@@ -28,7 +28,7 @@ the tiers are no longer mentioned in GitLab documentation: ...@@ -28,7 +28,7 @@ the tiers are no longer mentioned in GitLab documentation:
- [Managing group memberships via LDAP](../user/group/index.md#manage-group-memberships-via-ldap) - [Managing group memberships via LDAP](../user/group/index.md#manage-group-memberships-via-ldap)
- [Member locking](../user/group/index.md#prevent-members-from-being-added-to-a-group) - [Member locking](../user/group/index.md#prevent-members-from-being-added-to-a-group)
- [Overriding user permissions](../user/group/index.md#override-user-permissions) - [Overriding user permissions](../user/group/index.md#override-user-permissions)
- [User contribution analysis](../user/group/index.md#user-contribution-analysis) - [User contribution analytics](../user/group/contribution_analytics/index.md)
- [Kerberos integration](../integration/kerberos.md) - [Kerberos integration](../integration/kerberos.md)
- Issue Boards: - Issue Boards:
- [Configurable issue boards](../user/project/issue_board.md#configurable-issue-boards) - [Configurable issue boards](../user/project/issue_board.md#configurable-issue-boards)
......
...@@ -79,7 +79,7 @@ The default behavior of [Delayed Project deletion](https://gitlab.com/gitlab-org ...@@ -79,7 +79,7 @@ The default behavior of [Delayed Project deletion](https://gitlab.com/gitlab-org
[Immediate deletion](https://gitlab.com/gitlab-org/gitlab/-/issues/220382) in GitLab 13.2. [Immediate deletion](https://gitlab.com/gitlab-org/gitlab/-/issues/220382) in GitLab 13.2.
Projects in a group (but not a personal namespace) can be deleted after a delayed period, by Projects in a group (but not a personal namespace) can be deleted after a delayed period, by
[configuring in Group Settings](../../group/index.md#enabling-delayed-project-removal). [configuring in Group Settings](../../group/index.md#enable-delayed-project-removal).
The default period is seven days, and can be changed. Setting this period to `0` enables immediate removal The default period is seven days, and can be changed. Setting this period to `0` enables immediate removal
of projects or groups. of projects or groups.
......
This diff is collapsed.
...@@ -266,7 +266,7 @@ This action: ...@@ -266,7 +266,7 @@ This action:
- Deletes a project including all associated resources (issues, merge requests etc). - Deletes a project including all associated resources (issues, merge requests etc).
- From [GitLab 13.2](https://gitlab.com/gitlab-org/gitlab/-/issues/220382) on [Premium](https://about.gitlab.com/pricing/) or higher tiers, - From [GitLab 13.2](https://gitlab.com/gitlab-org/gitlab/-/issues/220382) on [Premium](https://about.gitlab.com/pricing/) or higher tiers,
group owners can [configure](../../group/index.md#enabling-delayed-project-removal) projects within a group group owners can [configure](../../group/index.md#enable-delayed-project-removal) projects within a group
to be deleted after a delayed period. to be deleted after a delayed period.
When enabled, actual deletion happens after number of days When enabled, actual deletion happens after number of days
specified in [instance settings](../../admin_area/settings/visibility_and_access_controls.md#default-deletion-delay). specified in [instance settings](../../admin_area/settings/visibility_and_access_controls.md#default-deletion-delay).
......
...@@ -212,7 +212,7 @@ To delete a project, first navigate to the home page for that project. ...@@ -212,7 +212,7 @@ To delete a project, first navigate to the home page for that project.
1. Click **Delete project** 1. Click **Delete project**
1. Confirm this action by typing in the expected text. 1. Confirm this action by typing in the expected text.
Projects in personal namespaces are deleted immediately on request. For information on delayed deletion of projects in a group, please see [Enabling delayed project removal](../group/index.md#enabling-delayed-project-removal). Projects in personal namespaces are deleted immediately on request. For information on delayed deletion of projects in a group, please see [Enable delayed project removal](../group/index.md#enable-delayed-project-removal).
## Project settings ## Project settings
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
= insight_form.label :project_id, class: 'label-light' do = insight_form.label :project_id, class: 'label-light' do
.form-text.text-muted .form-text.text-muted
= _('Select a repository') = _('Select a repository')
= link_to sprite_icon('question-o'), help_page_path('user/group/index.md', anchor: 'insights'), target: '_blank' = link_to sprite_icon('question-o'), help_page_path('user/group/insights/index.md'), target: '_blank'
= project_select_tag('group[insight_attributes][project_id]', class: 'project-item-select hidden-filter-value', toggle_class: 'js-project-search js-project-filter js-filter-submit', dropdown_class: 'dropdown-menu-selectable dropdown-menu-project js-filter-submit', = project_select_tag('group[insight_attributes][project_id]', class: 'project-item-select hidden-filter-value', toggle_class: 'js-project-search js-project-filter js-filter-submit', dropdown_class: 'dropdown-menu-selectable dropdown-menu-project js-filter-submit',
placeholder: _('Search projects'), idAttribute: 'id', data: { order_by: 'last_activity_at', idattribute: 'id', simple_filter: true, allow_clear: true, include_projects_in_subgroups: true }, value: insight.project_id) placeholder: _('Search projects'), idAttribute: 'id', data: { order_by: 'last_activity_at', idattribute: 'id', simple_filter: true, allow_clear: true, include_projects_in_subgroups: true }, value: insight.project_id)
= form.submit _('Save changes'), class: "btn gl-button btn-success" = form.submit _('Save changes'), class: "btn gl-button btn-success"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment