diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-10 06:07:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-10 06:07:43 +0300 |
| commit | 677227413ae31f5a02fd4c8e10f6ef50c228334f (patch) | |
| tree | fbd07453cf1aaded55f081bb42fa043b3f3ffc2b /doc | |
| parent | 3f22924df411018ba665ecf72ab0768d61173477 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/ci/yaml/index.md | 1 | ||||
| -rw-r--r-- | doc/user/project/merge_requests/status_checks.md | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/doc/ci/yaml/index.md b/doc/ci/yaml/index.md index dfe4ac7446e..dd36d649227 100644 --- a/doc/ci/yaml/index.md +++ b/doc/ci/yaml/index.md @@ -1116,6 +1116,7 @@ Caches are: - Shared between pipelines and jobs. - By default, not shared between [protected](../../user/project/protected_branches.md) and unprotected branches. - Restored before [artifacts](#artifacts). +- Limited to a maximum of four [different caches](../caching/index.md#use-multiple-caches). You can [disable caching for specific jobs](../caching/index.md#disable-cache-for-specific-jobs), for example to override: diff --git a/doc/user/project/merge_requests/status_checks.md b/doc/user/project/merge_requests/status_checks.md index dadb1b392d9..c9f63ffd3da 100644 --- a/doc/user/project/merge_requests/status_checks.md +++ b/doc/user/project/merge_requests/status_checks.md @@ -31,11 +31,7 @@ see the [external status checks epic](https://gitlab.com/groups/gitlab-org/-/epi > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/369859) in GitLab 15.5 [with a flag](../../../administration/feature_flags.md) named `only_allow_merge_if_all_status_checks_passed`. Disabled by default. > - [Enabled on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/372340) in GitLab 15.8. -> - Enabled on self-managed in GitLab 15.9. - -FLAG: -On self-managed GitLab, this feature is available by default. To disable it per project or for your entire instance, ask an administrator to -[disable the feature flag](../../../administration/feature_flags.md) named `only_allow_merge_if_all_status_checks_passed`. On GitLab.com, this feature is available but can be configured by GitLab.com administrators only. +> - Enabled on self-managed and feature flag [removed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111492) in GitLab 15.9. By default, merge requests in projects can be merged even if external status checks fail. To block the merging of merge requests when external checks fail: |