Commit 705a27e0 authored by Amy Qualls's avatar Amy Qualls

Merge branch 'hchouraria-docs-rebase-author-of-commit-no-approval' into 'master'

Add note about rebasing preventing approvals

See merge request gitlab-org/gitlab!74035
parents 28cf5c88 a5aafc7a
...@@ -145,6 +145,11 @@ To rebase from the UI: ...@@ -145,6 +145,11 @@ To rebase from the UI:
GitLab schedules a rebase of the feature branch against the default branch and GitLab schedules a rebase of the feature branch against the default branch and
executes it as soon as possible. executes it as soon as possible.
The user performing the rebase action is considered
a user that added commits to the merge request. When the merge request approvals setting
[**Prevent approvals by users who add commits**](../../user/project/merge_requests/approvals/settings.md#prevent-approvals-by-users-who-add-commits)
is enabled, this setting prevents the user from also approving the merge request.
### Interactive rebase ### Interactive rebase
You can use interactive rebase to modify commits. For example, amend a commit You can use interactive rebase to modify commits. For example, amend a commit
......
...@@ -38,6 +38,8 @@ Now, when you visit the merge request page, you can accept it ...@@ -38,6 +38,8 @@ Now, when you visit the merge request page, you can accept it
If a fast-forward merge is not possible but a conflict free rebase is possible, If a fast-forward merge is not possible but a conflict free rebase is possible,
a rebase button is offered. a rebase button is offered.
The rebase action is also available as a [quick action command: `/rebase`](../../../topics/git/git_rebase.md#rebase-from-the-gitlab-ui).
![Fast forward merge request](img/ff_merge_rebase.png) ![Fast forward merge request](img/ff_merge_rebase.png)
If the target branch is ahead of the source branch and a conflict free rebase is If the target branch is ahead of the source branch and a conflict free rebase is
......
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