Merge branch 'zj-slack-404-error' into 'master'

Fix format of Slack when result is nil

Closes #25954

See merge request !8248

2 files changed, 3 insertions, 2 deletions

diff --git a/app/models/project_services/slack_slash_commands_service.rb b/app/models/project_services/slack_slash_commands_service.rb
index cb19ebf4cad..5a7cc0fb329 100644
--- a/app/models/project_services/slack_slash_commands_service.rb
+++ b/app/models/project_services/slack_slash_commands_service.rb
@@ -16,7 +16,7 @@ class SlackSlashCommandsService < ChatSlashCommandsService
   def trigger(params)
     # Format messages to be Slack-compatible
     super.tap do |result|
-      result[:text] = format(result[:text])
+      result[:text] = format(result[:text]) if result.is_a?(Hash)
     end
   end
 
diff --git a/spec/models/project_services/slack_slash_commands_service.rb b/spec/models/project_services/slack_slash_commands_service_spec.rb
index 5775e439906..5766aa340e2 100644
--- a/spec/models/project_services/slack_slash_commands_service.rb
+++ b/spec/models/project_services/slack_slash_commands_service_spec.rb
@@ -18,7 +18,8 @@ describe SlackSlashCommandsService, :models do
 
       let(:service) do
         project.create_slack_slash_commands_service(
-          properties: { token: 'token' }
+          properties: { token: 'token' },
+          active: true
         )
       end