From 7d1b3d4e272b1d11b6f53389169358373e2fae60 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 14 Aug 2013 16:02:21 +0300 Subject: [PATCH] Fix passign full user object instead of id to Event.create --- app/observers/activity_observer.rb | 2 +- app/observers/merge_request_observer.rb | 2 +- spec/observers/activity_observer_spec.rb | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/observers/activity_observer.rb b/app/observers/activity_observer.rb index 92aa299c5ab..477ebd78aeb 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 6843f33da76..689a25ff4b7 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 e93c969d5fe..78837552438 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 -- GitLab