diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-21 12:14:15 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-21 12:14:15 +0000 |
| commit | 55e3b0c9100c453fa32055dc2c76bd7ebfa23a17 (patch) | |
| tree | be205a5fe067983f154884f724511ba6fdb2620e /app/services/merge_requests/squash_service.rb | |
| parent | 3442b76bbd896c85c06feaa56e3d9355a3945523 (diff) | |
| download | gitlab-ce-55e3b0c9100c453fa32055dc2c76bd7ebfa23a17.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/merge_requests/squash_service.rb')
| -rw-r--r-- | app/services/merge_requests/squash_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/merge_requests/squash_service.rb b/app/services/merge_requests/squash_service.rb index 0600fd1d740..daed1ccfa5b 100644 --- a/app/services/merge_requests/squash_service.rb +++ b/app/services/merge_requests/squash_service.rb @@ -39,7 +39,7 @@ module MergeRequests end def message - params[:squash_commit_message].presence || merge_request.default_squash_commit_message + params[:squash_commit_message].presence || merge_request.default_squash_commit_message(user: current_user) end end end |