summaryrefslogtreecommitdiff
path: root/app/services/merge_requests/base_merge_service.rb
diff options
context:
space:
mode:
authorKirill Zaitsev <kirik910@gmail.com>2014-10-05 17:03:15 +0400
committerKirill Zaitsev <kirik910@gmail.com>2014-10-05 20:41:33 +0400
commit11848febd1170042523907652a36503c57e9fac2 (patch)
treebe7b20034c4b140a054fac94176aba2c55275cfb /app/services/merge_requests/base_merge_service.rb
parent43be3fcb833fe522721a7192fffd8d7348b01ffb (diff)
downloadgitlab-ce-11848febd1170042523907652a36503c57e9fac2.tar.gz
Add issueable actor
Diffstat (limited to 'app/services/merge_requests/base_merge_service.rb')
-rw-r--r--app/services/merge_requests/base_merge_service.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/merge_requests/base_merge_service.rb b/app/services/merge_requests/base_merge_service.rb
index 9bc50d3d16c..700a21ca011 100644
--- a/app/services/merge_requests/base_merge_service.rb
+++ b/app/services/merge_requests/base_merge_service.rb
@@ -13,7 +13,8 @@ module MergeRequests
def execute_project_hooks(merge_request)
if merge_request.project
- merge_request.project.execute_hooks(merge_request.to_hook_data, :merge_request_hooks)
+ hook_data = merge_request.to_hook_data(current_user)
+ merge_request.project.execute_hooks(hook_data, :merge_request_hooks)
end
end
end