diff --git a/app/observers/activity_observer.rb b/app/observers/activity_observer.rb index 92aa299..477ebd7 100644 --- a/app/observers/activity_observer.rb +++ b/app/observers/activity_observer.rb @@ -33,7 +33,7 @@ class ActivityObserver < BaseObserver target_id: record.id, target_type: record.class.name, action: status, - author_id: current_user + author_id: current_user.id ) end end diff --git a/app/observers/merge_request_observer.rb b/app/observers/merge_request_observer.rb index 6843f33..689a25f 100644 --- a/app/observers/merge_request_observer.rb +++ b/app/observers/merge_request_observer.rb @@ -46,7 +46,7 @@ class MergeRequestObserver < ActivityObserver target_id: record.id, target_type: record.class.name, action: status, - author_id: current_user + author_id: current_user.id ) end end diff --git a/spec/observers/activity_observer_spec.rb b/spec/observers/activity_observer_spec.rb index e93c969..7883755 100644 --- a/spec/observers/activity_observer_spec.rb +++ b/spec/observers/activity_observer_spec.rb @@ -8,7 +8,6 @@ describe ActivityObserver do it { @event.project.should == project } end - describe "Issue created" do before do Issue.observers.enable :activity_observer do -- libgit2 0.21.2