Commit 7d1b3d4e272b1d11b6f53389169358373e2fae60
1 parent
6579ba3e
Exists in
master
and in
4 other branches
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
| @@ -33,7 +33,7 @@ class ActivityObserver < BaseObserver | @@ -33,7 +33,7 @@ class ActivityObserver < BaseObserver | ||
| 33 | target_id: record.id, | 33 | target_id: record.id, |
| 34 | target_type: record.class.name, | 34 | target_type: record.class.name, |
| 35 | action: status, | 35 | action: status, |
| 36 | - author_id: current_user | 36 | + author_id: current_user.id |
| 37 | ) | 37 | ) |
| 38 | end | 38 | end |
| 39 | end | 39 | end |
app/observers/merge_request_observer.rb
| @@ -46,7 +46,7 @@ class MergeRequestObserver < ActivityObserver | @@ -46,7 +46,7 @@ class MergeRequestObserver < ActivityObserver | ||
| 46 | target_id: record.id, | 46 | target_id: record.id, |
| 47 | target_type: record.class.name, | 47 | target_type: record.class.name, |
| 48 | action: status, | 48 | action: status, |
| 49 | - author_id: current_user | 49 | + author_id: current_user.id |
| 50 | ) | 50 | ) |
| 51 | end | 51 | end |
| 52 | end | 52 | end |
spec/observers/activity_observer_spec.rb
| @@ -8,7 +8,6 @@ describe ActivityObserver do | @@ -8,7 +8,6 @@ describe ActivityObserver do | ||
| 8 | it { @event.project.should == project } | 8 | it { @event.project.should == project } |
| 9 | end | 9 | end |
| 10 | 10 | ||
| 11 | - | ||
| 12 | describe "Issue created" do | 11 | describe "Issue created" do |
| 13 | before do | 12 | before do |
| 14 | Issue.observers.enable :activity_observer do | 13 | Issue.observers.enable :activity_observer do |