Move creation of favorites into controller. Also adding merge request to owner's favorites upon creation

1 files changed, 6 insertions, 1 deletions

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 9e8c8bb..25cb426 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -35,6 +35,7 @@ class MergeRequest < ActiveRecord::Base
 
   before_destroy :nullify_messages
   after_destroy  :delete_tracking_branches
+  after_create :add_to_creators_favorites
 
   before_validation_on_create :set_sequence_number
 
@@ -384,7 +385,7 @@ class MergeRequest < ActiveRecord::Base
   end
 
   def add_to_reviewers_favorites(reviewer)
-    reviewer.favorites.create(:watchable => self, :skip_events => true)
+    reviewer.favorites.create(:watchable => self)
   end
 
   def add_creation_event(owner, user)
@@ -633,4 +634,8 @@ class MergeRequest < ActiveRecord::Base
       self.sequence_number = target_repository.next_merge_request_sequence_number
     end
   end
+
+  def add_to_creators_favorites
+    user.favorites.create(:watchable => self)
+  end
 end