updates from Production

app/controllers/channels_controller.rb

@@ -369,6 +369,12 @@ class ChannelsController < ApplicationController
       if channel.save && feed.save
         status = entry_id
 
+        # queue reacts, but don't cause an error
+        begin
+          channel.queue_react
+        rescue
+        end
+
         # check for tweet
         if params[:twitter] && params[:tweet]
           # check username
@@ -603,4 +609,3 @@ class ChannelsController < ApplicationController
     end
 
 end
-

app/models/feed.rb

@@ -26,9 +26,6 @@ class Feed < ActiveRecord::Base
   extend FeedHelper
   belongs_to :channel
 
-  after_commit :queue_react
-  delegate :queue_react, :to => :channel
-
   self.include_root_in_json = false
 
   attr_readonly :created_at
@@ -156,4 +153,3 @@ class Feed < ActiveRecord::Base
   end
 
 end
-