diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-10 12:12:15 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-10 12:12:15 +0000 |
| commit | 70eb0cf7518e1ccc2a26d9aaa9fc16e21c6de5f1 (patch) | |
| tree | 01b2cad5224d5f9664b840ff75610db60b9ff095 /app/controllers/projects/merge_requests_controller.rb | |
| parent | ae1c8db2c805a6d3fad3a66fa31bd414cc071490 (diff) | |
| download | gitlab-ce-70eb0cf7518e1ccc2a26d9aaa9fc16e21c6de5f1.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/projects/merge_requests_controller.rb')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 13ebe57a4d9..ce5d0c45a1e 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -365,7 +365,7 @@ class Projects::MergeRequestsController < Projects::MergeRequests::ApplicationCo end def rebase - @merge_request.rebase_async(current_user.id) + @merge_request.rebase_async(current_user.id, skip_ci: Gitlab::Utils.to_boolean(merge_params[:skip_ci], default: false)) head :ok rescue MergeRequest::RebaseLockTimeout => e |