diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 11:59:07 +0000 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /app/services/integrations | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) | |
download | gitlab-ce-8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca.tar.gz |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'app/services/integrations')
-rw-r--r-- | app/services/integrations/test/project_service.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/services/integrations/test/project_service.rb b/app/services/integrations/test/project_service.rb index 39471d373f9..d72ca928c34 100644 --- a/app/services/integrations/test/project_service.rb +++ b/app/services/integrations/test/project_service.rb @@ -16,9 +16,7 @@ module Integrations def data strong_memoize(:data) do - next pipeline_events_data if integration.is_a?(::PipelinesEmailService) - - case event + case event || integration.default_test_event when 'push', 'tag_push' push_events_data when 'note', 'confidential_note' @@ -37,8 +35,6 @@ module Integrations deployment_events_data when 'release' releases_events_data - else - push_events_data end end end |