summaryrefslogtreecommitdiff
path: root/app/services/commits/change_service.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-05-27 15:10:39 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-05-27 15:10:39 +0000
commitf719944deedf392d98947cb1c499169696c8da70 (patch)
tree246cfc50c88569edf1077b2e4927df4154f77150 /app/services/commits/change_service.rb
parent0afd7f18171f70cb8f4296ff9a32381c6919027f (diff)
downloadgitlab-ce-f719944deedf392d98947cb1c499169696c8da70.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/commits/change_service.rb')
-rw-r--r--app/services/commits/change_service.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/services/commits/change_service.rb b/app/services/commits/change_service.rb
index edb9f04ccd7..dc7f84ab807 100644
--- a/app/services/commits/change_service.rb
+++ b/app/services/commits/change_service.rb
@@ -6,6 +6,7 @@ module Commits
super
@commit = params[:commit]
+ @message = params[:message]
end
private
@@ -14,7 +15,9 @@ module Commits
raise NotImplementedError unless repository.respond_to?(action)
# rubocop:disable GitlabSecurity/PublicSend
- message = @commit.public_send(:"#{action}_message", current_user)
+ message =
+ @message || @commit.public_send(:"#{action}_message", current_user)
+
repository.public_send(
action,
current_user,