diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2016-12-22 10:54:35 +0100 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2016-12-22 14:36:58 +0100 |
| commit | 4b7395e0fab8e35436957e41929b44f948a1c41a (patch) | |
| tree | 672c2c4b0dd424d6d7971cdd024e7693412770f7 | |
| parent | 6d9c1d3efce00da95832feaaf36227bcbffecadf (diff) | |
| download | gitlab-ce-zj-slack-404-error.tar.gz | |
Fix format of Slack when result is nilzj-slack-404-error
| -rw-r--r-- | app/models/project_services/slack_slash_commands_service.rb | 2 | ||||
| -rw-r--r-- | spec/models/project_services/slack_slash_commands_service_spec.rb (renamed from spec/models/project_services/slack_slash_commands_service.rb) | 3 |
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 |