Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValeriy Sizov <vsv2711@gmail.com>2014-11-05 13:10:50 +0300
committerValeriy Sizov <vsv2711@gmail.com>2014-11-05 13:10:50 +0300
commit5c6b21f1c23e9bb7bf527797799acf60e272bbca (patch)
tree5ab5ba53ec80002dca6be1e7e35fd4e3902d4258 /app/services/merge_requests/base_service.rb
parent652f4c8090793de4737b904b5feb11c27424f4c5 (diff)
parent11848febd1170042523907652a36503c57e9fac2 (diff)
Merge pull request #7967 from Bugagazavr/issue-actor
Add issueable actor to hooks
Diffstat (limited to 'app/services/merge_requests/base_service.rb')
-rw-r--r--app/services/merge_requests/base_service.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/merge_requests/base_service.rb b/app/services/merge_requests/base_service.rb
index 694994001b0..7f3421b8e4b 100644
--- a/app/services/merge_requests/base_service.rb
+++ b/app/services/merge_requests/base_service.rb
@@ -7,7 +7,8 @@ module MergeRequests
def execute_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