diff --git a/doc/administration/instance_limits.md b/doc/administration/instance_limits.md index 80fd59df1d909282092ed460de3f36ba2e382d02..ea5a38debee2b885da9dfa78718839411b435e19 100644 --- a/doc/administration/instance_limits.md +++ b/doc/administration/instance_limits.md @@ -1021,6 +1021,27 @@ The lower limits result in additional diffs being collapsed. The higher limits prevent any more changes from rendering. For more information about these limits, [read the development documentation](../development/merge_request_concepts/diffs/_index.md#diff-limits). +### Diff version limit + +{{< history >}} + +- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/521970) in GitLab 17.10 [with a flag](feature_flags.md) named `merge_requests_diffs_limit`. Disabled by default. +- [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/521970) in GitLab 17.10. + +{{< /history >}} + +{{< alert type="flag" >}} + +The availability of this feature is controlled by a feature flag. +For more information, see the history. +This feature is available for testing, but not ready for production use. + +{{< /alert >}} + +GitLab limits each merge request to 1000 [diff versions](../user/project/merge_requests/versions.md). +Merge requests that reach this limit cannot be updated further. Instead, +close the affected merge request and create a new merge request. + ### Merge request reports size limit Reports that go over the 20 MB limit aren't loaded. Affected reports: diff --git a/doc/user/gitlab_com/_index.md b/doc/user/gitlab_com/_index.md index b57084fd6254e84e3f40c69cef670612b1e0e3b4..83c87ea30a3aa04d77ff99731e0ed9ab433f0967 100644 --- a/doc/user/gitlab_com/_index.md +++ b/doc/user/gitlab_com/_index.md @@ -618,3 +618,24 @@ GitLab.com runs [Sidekiq](https://sidekiq.org) as an [external process](../../ad for Ruby job scheduling. The current settings are in the [GitLab.com Kubernetes pod configuration](https://gitlab.com/gitlab-com/gl-infra/k8s-workloads/gitlab-com/-/blob/master/releases/gitlab/values/gprd.yaml.gotmpl). + +## Merge request limits + +{{< history >}} + +- [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/521970) in GitLab 17.10 [with a flag](../../administration/feature_flags.md) named `merge_requests_diffs_limit`. Disabled by default. +- [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/521970) in GitLab 17.10. + +{{< /history >}} + +{{< alert type="flag" >}} + +The availability of this feature is controlled by a feature flag. +For more information, see the history. +This feature is available for testing, but not ready for production use. + +{{< /alert >}} + +GitLab limits each merge request to 1000 [diff versions](../project/merge_requests/versions.md). +Merge requests that reach this limit cannot be updated further. Instead, +close the affected merge request and create a new merge request.