summaryrefslogtreecommitdiff
path: root/app/services/merge_requests/merge_base_service.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/services/merge_requests/merge_base_service.rb')
-rw-r--r--app/services/merge_requests/merge_base_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/merge_requests/merge_base_service.rb b/app/services/merge_requests/merge_base_service.rb
index 3b9d3bccacf..3e630d40b3d 100644
--- a/app/services/merge_requests/merge_base_service.rb
+++ b/app/services/merge_requests/merge_base_service.rb
@@ -56,7 +56,7 @@ module MergeRequests
def commit_message
params[:commit_message] ||
- merge_request.default_merge_commit_message
+ merge_request.default_merge_commit_message(user: current_user)
end
def squash_sha!