diff options
| author | Drew Blessing <drew.blessing@mac.com> | 2015-03-13 00:41:07 +0000 |
|---|---|---|
| committer | Drew Blessing <drew.blessing@mac.com> | 2015-03-13 00:41:07 +0000 |
| commit | 606d24ff2df157ec70003132d1ead7a47dc32883 (patch) | |
| tree | ad0791f882aa8eaca1eac660ff8b8cd428ea60c3 | |
| parent | c0579757d59ffe0960a2f18b94bad1c143ec7459 (diff) | |
| parent | 6ddd45948f35dd6a3e04fbaf95d9f6935b4cbbc1 (diff) | |
| download | gitlab-ce-606d24ff2df157ec70003132d1ead7a47dc32883.tar.gz | |
Merge branch 'irker-service-use-supported-events' into 'master'
Make Irker service check supported_events
63178a9509f72eb7adf1c73c2fc6dc1ec0a1ea42 added the supported_events check for services. Since f84b7eef3f969a65d0930c9d62b6968b2ae70f12 was just added, we should adjust it accordingly.
See merge request !367
| -rw-r--r-- | app/models/project_services/irker_service.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/app/models/project_services/irker_service.rb b/app/models/project_services/irker_service.rb index deb210c61e4..2bddb7b881c 100644 --- a/app/models/project_services/irker_service.rb +++ b/app/models/project_services/irker_service.rb @@ -68,9 +68,15 @@ class IrkerService < Service 'irker' end - def execute(push_data) + def supported_events + %w(push) + end + + def execute(data) + return unless supported_events.include?(data[:object_kind]) + IrkerWorker.perform_async(project_id, channels, - colorize_messages, push_data, @settings) + colorize_messages, data, @settings) end def fields |