summaryrefslogtreecommitdiff
path: root/app/services/merge_requests/squash_service.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/services/merge_requests/squash_service.rb')
-rw-r--r--app/services/merge_requests/squash_service.rb2
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 90cf4af7e41..69b9740c2a5 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