Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 2 deletions

diff --git a/lib/gitlab/suggestions/commit_message.rb b/lib/gitlab/suggestions/commit_message.rb
index d59a8fc3730..5bca3efe6e1 100644
--- a/lib/gitlab/suggestions/commit_message.rb
+++ b/lib/gitlab/suggestions/commit_message.rb
@@ -6,14 +6,15 @@ module Gitlab
       DEFAULT_SUGGESTION_COMMIT_MESSAGE =
         'Apply %{suggestions_count} suggestion(s) to %{files_count} file(s)'
 
-      def initialize(user, suggestion_set)
+      def initialize(user, suggestion_set, custom_message = nil)
         @user = user
         @suggestion_set = suggestion_set
+        @custom_message = custom_message
       end
 
       def message
         project = suggestion_set.project
-        user_defined_message = project.suggestion_commit_message.presence
+        user_defined_message = @custom_message.presence || project.suggestion_commit_message.presence
         message = user_defined_message || DEFAULT_SUGGESTION_COMMIT_MESSAGE
 
         Gitlab::StringPlaceholderReplacer