diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/favorite.rb | 10 | ||||
| -rw-r--r-- | app/models/merge_request.rb | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/app/models/favorite.rb b/app/models/favorite.rb index ac22006..58c3bc0 100644 --- a/app/models/favorite.rb +++ b/app/models/favorite.rb @@ -29,9 +29,17 @@ class Favorite < ActiveRecord::Base def event_options {:action => Action::ADD_FAVORITE, :data => watchable.id, - :body => watchable.class.name, :project_id => watchable.project.id, + :body => watchable.class.name, :project_id => project.id, :target_type => "User", :target_id => user.id} end + + def project + if MergeRequest === watchable + watchable.target_repository.project + else + watchable.project + end + end def create_event user.events.create(event_options) diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index a72c326..67ea0a0 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -22,6 +22,7 @@ class MergeRequest < ActiveRecord::Base include ActiveMessaging::MessageSender + include Watchable belongs_to :user belongs_to :source_repository, :class_name => 'Repository' |