Download as
Browse Code »

Commit 7d1b3d4e272b1d11b6f53389169358373e2fae60

Authored by Dmitriy Zaporozhets
1 parent 6579ba3e
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix passign full user object instead of id to Event.create

Showing 3 changed files with 2 additions and 3 deletions   Show diff stats
app/observers/activity_observer.rb
  Diff comments   View file @7d1b3d4
... ... @@ -33,7 +33,7 @@ class ActivityObserver < BaseObserver
33 33 target_id: record.id,
34 34 target_type: record.class.name,
35 35 action: status,
36   - author_id: current_user
  36 + author_id: current_user.id
37 37 )
38 38 end
39 39 end
... ...
app/observers/merge_request_observer.rb
  Diff comments   View file @7d1b3d4
... ... @@ -46,7 +46,7 @@ class MergeRequestObserver < ActivityObserver
46 46 target_id: record.id,
47 47 target_type: record.class.name,
48 48 action: status,
49   - author_id: current_user
  49 + author_id: current_user.id
50 50 )
51 51 end
52 52 end
... ...
spec/observers/activity_observer_spec.rb
  Diff comments   View file @7d1b3d4
... ... @@ -8,7 +8,6 @@ describe ActivityObserver do
8 8 it { @event.project.should == project }
9 9 end
10 10  
11   -
12 11 describe "Issue created" do
13 12 before do
14 13 Issue.observers.enable :activity_observer do
... ...