Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-11-09 21:13:13 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-11-09 21:13:13 +0300
commitefcaec8a140e2b93d1f43d5afd7a5c35cdd4dad7 (patch)
treef10a4a70e5c9213c4cdc7a55788e69f8850d899b /doc/topics/git/git_rebase.md
parente6a54b33a9712d7f1a995df47f678fbb78bcd6b7 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/topics/git/git_rebase.md')
-rw-r--r--doc/topics/git/git_rebase.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/topics/git/git_rebase.md b/doc/topics/git/git_rebase.md
index 72bb2bf3fdc..c0bc7ed4e5c 100644
--- a/doc/topics/git/git_rebase.md
+++ b/doc/topics/git/git_rebase.md
@@ -145,6 +145,11 @@ To rebase from the UI:
GitLab schedules a rebase of the feature branch against the default branch and
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
You can use interactive rebase to modify commits. For example, amend a commit