diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-12-22 18:26:08 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2016-12-22 18:26:08 +0300 |
| commit | fbd8fd883bfc1c1c6e5fda132c8759c608fa7980 (patch) | |
| tree | 95020215773549bc96dfa07348dbb205bb1533a3 /spec/models/project_services | |
| parent | f3a5409c581dc79262fe60d1c38d68f654338e20 (diff) | |
| parent | 4b7395e0fab8e35436957e41929b44f948a1c41a (diff) | |
Merge branch 'zj-slack-404-error' into 'master'
Fix format of Slack when result is nil
Closes #25954
See merge request !8248
Diffstat (limited to 'spec/models/project_services')
| -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 |
1 files changed, 2 insertions, 1 deletions
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 |