diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-04 21:15:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-04 21:15:15 +0300 |
| commit | 795b6eb292706d577c13556a3583897f082dda6e (patch) | |
| tree | 198ce8bed9a60d80609c9bb82615649e321c8af9 /doc/user | |
| parent | a155ff5671d06afd4c219a49b6c9fd673af69876 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
| -rw-r--r-- | doc/user/project/merge_requests/methods/index.md | 7 | ||||
| -rw-r--r-- | doc/user/project/protected_branches.md | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/doc/user/project/merge_requests/methods/index.md b/doc/user/project/merge_requests/methods/index.md index 959ada4928e..a0372f895df 100644 --- a/doc/user/project/merge_requests/methods/index.md +++ b/doc/user/project/merge_requests/methods/index.md @@ -220,8 +220,11 @@ considered equivalent to rebasing. To rebase a merge request's branch without triggering a CI/CD pipeline, select **Rebase without pipeline** from the merge request reports section. -This option is available when fast-forward merge is not possible but a conflict-free -rebase is possible. + +This option is: + +- Available when fast-forward merge is not possible but a conflict-free rebase is possible. +- Not available when the **Pipelines must succeed** option is enabled. Rebasing without a CI/CD pipeline saves resources in projects with a semi-linear workflow that requires frequent rebases. diff --git a/doc/user/project/protected_branches.md b/doc/user/project/protected_branches.md index 2ec92fbb52f..a77babb6cd6 100644 --- a/doc/user/project/protected_branches.md +++ b/doc/user/project/protected_branches.md @@ -363,6 +363,10 @@ Thus, they can skip merge request approval rules, Code Owners included. The permission to merge or push to protected branches defines whether or not a user can run CI/CD pipelines and execute actions on jobs. +Because [merge request pipelines](../../ci/pipelines/merge_request_pipelines.md) run on the source +branch, a pipeline isn't created if the user opening a merge request does not have permission to merge +or push to the source branch. + See [Security on protected branches](../../ci/pipelines/index.md#pipeline-security-on-protected-branches) for details about the pipelines security model. |