diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-14 16:02:21 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-08-14 16:02:21 +0300 |
| commit | 7d1b3d4e272b1d11b6f53389169358373e2fae60 (patch) | |
| tree | 09830127ed11f6a5d585da78277867aa7094fa89 /app/observers | |
| parent | 6579ba3e7733d061c77d56cdd7aa98b7c38a94d6 (diff) | |
| download | gitlab-ce-7d1b3d4e272b1d11b6f53389169358373e2fae60.tar.gz | |
Fix passign full user object instead of id to Event.create
Diffstat (limited to 'app/observers')
| -rw-r--r-- | app/observers/activity_observer.rb | 2 | ||||
| -rw-r--r-- | app/observers/merge_request_observer.rb | 2 |
2 files changed, 2 insertions, 2 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 |