Merge pull request #550 from travis-ci/ar-fix-multiple-notificactions

Add build:canceled event to Email EventHandler
travis-ci · May 9, 2016 · 3512abe · 3512abe
2 parents af74ded + ee78340
commit 3512abe
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 4 deletions.
diff --git a/lib/travis/addons/email/event_handler.rb b/lib/travis/addons/email/event_handler.rb
@@ -10,7 +10,7 @@ module Email
       class EventHandler < Event::Handler
         API_VERSION = 'v2'
 
-        EVENTS = 'build:finished'
+        EVENTS = ['build:finished', 'build:canceled']
 
         def handle?
           !pull_request? && config.enabled?(:email) && config.send_on_finished_for?(:email) && recipients.present?

diff --git a/lib/travis/event.rb b/lib/travis/event.rb
@@ -55,4 +55,3 @@ def client_event(event, object)
       end
   end
 end
-
diff --git a/lib/travis/event/subscription.rb b/lib/travis/event/subscription.rb
@@ -59,4 +59,3 @@ def increment_counter(event)
     end
   end
 end
-
diff --git a/lib/travis/model/build/states.rb b/lib/travis/model/build/states.rb
@@ -72,7 +72,6 @@ def cancel_job
       if matrix_finished?
         finalize_cancel
         denormalize(:cancel)
-        notify(:cancel)
       end
     end