diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-03 14:08:00 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-12-04 15:37:17 +0400 |
| commit | 5f9cdbab1d8373f3455c1cd8136db6479a54adf7 (patch) | |
| tree | bb3bdfabf3808baad08d75fadb36dd9b9b756caa /app/observers | |
| parent | cfcf24dce53d79c950de12eca0353b890ad95508 (diff) | |
Modify test to pass new project hooks
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/observers')
| -rw-r--r-- | app/observers/merge_request_observer.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/observers/merge_request_observer.rb b/app/observers/merge_request_observer.rb index 9e41f8c38a8..96492198111 100644 --- a/app/observers/merge_request_observer.rb +++ b/app/observers/merge_request_observer.rb @@ -64,6 +64,8 @@ class MergeRequestObserver < ActivityObserver end def execute_hooks(merge_request) - merge_request.project.execute_hooks(merge_request.to_hook_data, :merge_request_hooks) + if merge_request.project + merge_request.project.execute_hooks(merge_request.to_hook_data, :merge_request_hooks) + end end end |