Commit 2e13c9bb authored by Amy Qualls's avatar Amy Qualls

Merge branch 'docs-create-ft-cleanup-1' into 'master'

Docs: Create future tense cleanup (1)

See merge request gitlab-org/gitlab!53514
parents 9f9e152f 5ecd813b
...@@ -13,25 +13,25 @@ For details about diff files, [View changes between files](../project/merge_requ ...@@ -13,25 +13,25 @@ For details about diff files, [View changes between files](../project/merge_requ
## Maximum diff patch size ## Maximum diff patch size
Diff files which exceed this value will be presented as 'too large' and won't Diff files which exceed this value are presented as 'too large' and cannot
be expandable. Instead of an expandable view, a link to the blob view will be be expandable. Instead of an expandable view, a link to the blob view is
shown. shown.
Patches greater than 10% of this size will be automatically collapsed, and a Patches greater than 10% of this size are automatically collapsed, and a
link to expand the diff will be presented. link to expand the diff is presented.
This affects merge requests and branch comparison views.
NOTE: To set the maximum diff patch size:
Merge requests and branch comparison views will be affected.
WARNING:
This setting is experimental. An increased maximum will increase resource
consumption of your instance. Keep this in mind when adjusting the maximum.
1. Go to **Admin Area > Settings > General**. 1. Go to **Admin Area > Settings > General**.
1. Expand **Diff limits**. 1. Expand **Diff limits**.
1. Enter a value for **Maximum diff patch size**, measured in bytes. 1. Enter a value for **Maximum diff patch size**, measured in bytes.
1. Click on **Save changes**. 1. Click on **Save changes**.
WARNING:
This setting is experimental. An increased maximum increases resource
consumption of your instance. Keep this in mind when adjusting the maximum.
<!-- ## Troubleshooting <!-- ## Troubleshooting
Include any troubleshooting steps that you can foresee. If you know beforehand what issues Include any troubleshooting steps that you can foresee. If you know beforehand what issues
......
...@@ -172,9 +172,9 @@ To set a limit on how long personal access tokens are valid: ...@@ -172,9 +172,9 @@ To set a limit on how long personal access tokens are valid:
1. Fill in the **Maximum allowable lifetime for personal access tokens (days)** field. 1. Fill in the **Maximum allowable lifetime for personal access tokens (days)** field.
1. Click **Save changes**. 1. Click **Save changes**.
Once a lifetime for personal access tokens is set, GitLab will: Once a lifetime for personal access tokens is set, GitLab:
- Apply the lifetime for new personal access tokens, and require users to set an expiration date - Applies the lifetime for new personal access tokens, and require users to set an expiration date
and a date no later than the allowed lifetime. and a date no later than the allowed lifetime.
- After three hours, revoke old tokens with no expiration date or with a lifetime longer than the - After three hours, revoke old tokens with no expiration date or with a lifetime longer than the
allowed lifetime. Three hours is given to allow administrators to change the allowed lifetime, allowed lifetime. Three hours is given to allow administrators to change the allowed lifetime,
......
...@@ -22,10 +22,9 @@ select the project to serve as the custom template repository. ...@@ -22,10 +22,9 @@ select the project to serve as the custom template repository.
![File templates in the Admin Area](img/file_template_admin_area.png) ![File templates in the Admin Area](img/file_template_admin_area.png)
Once a project has been selected, you can add custom templates to the repository, After that, you can add custom templates to the selected repository and use them for the entire instance.
and they will appear in the appropriate places in the They will be available on the [Web Editor's dropdown](../../project/repository/web_editor.md#template-dropdowns)
[frontend](../../project/repository/web_editor.md#template-dropdowns) and and through the [API settings](../../../api/settings.md).
[API](../../../api/settings.md).
Templates must be added to a specific subdirectory in the repository, Templates must be added to a specific subdirectory in the repository,
corresponding to the kind of template. The following types of custom templates corresponding to the kind of template. The following types of custom templates
...@@ -61,9 +60,7 @@ extension and not be empty. So, the hierarchy should look like this: ...@@ -61,9 +60,7 @@ extension and not be empty. So, the hierarchy should look like this:
|-- another_metrics-dashboard.yml |-- another_metrics-dashboard.yml
``` ```
Once this is established, the list of custom templates will be included when Your custom templates will be displayed on the dropdown menu when a new file is added through the GitLab UI:
creating a new file and the template type is selected. These will appear at the
top of the list.
![Custom template dropdown menu](img/file_template_user_dropdown.png) ![Custom template dropdown menu](img/file_template_user_dropdown.png)
......
...@@ -9,17 +9,17 @@ type: reference ...@@ -9,17 +9,17 @@ type: reference
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/31007) in GitLab 12.4. > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/31007) in GitLab 12.4.
This allows you to set the number of changes (branches or tags) in a single push Set the number of branches or tags to limit the number of single push events
to determine whether individual push events or bulk push event will be created. allowed at once. If the number of events is greater than this, GitLab creates
Bulk push events will be created if it surpasses that value. bulk push event instead.
For example, if 4 branches are pushed and the limit is currently set to 3, For example, if 4 branches are pushed and the limit is currently set to 3,
you'll see the following in the activity feed: you'll see the following in the activity feed:
![Bulk push event](img/bulk_push_event_v12_4.png) ![Bulk push event](img/bulk_push_event_v12_4.png)
With this feature, when a single push includes a lot of changes (e.g. 1,000 With this feature, when a single push includes a lot of changes (for example, 1,000
branches), only 1 bulk push event will be created instead of creating 1,000 push branches), only 1 bulk push event is created instead of 1,000 push
events. This helps in maintaining good system performance and preventing spam on events. This helps in maintaining good system performance and preventing spam on
the activity feed. the activity feed.
......
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