Commit de7328b1 authored by Jan Provaznik's avatar Jan Provaznik

Merge branch '66368-remove-unnecessary-check-in-mr-hook' into 'master'

Remove unneeded check for merge_request.project

Closes #66368

See merge request gitlab-org/gitlab-ce!32086
parents 34bf7df0 0e274dfc
...@@ -17,12 +17,10 @@ module MergeRequests ...@@ -17,12 +17,10 @@ module MergeRequests
end end
def execute_hooks(merge_request, action = 'open', old_rev: nil, old_associations: {}) def execute_hooks(merge_request, action = 'open', old_rev: nil, old_associations: {})
if merge_request.project
merge_data = hook_data(merge_request, action, old_rev: old_rev, old_associations: old_associations) merge_data = hook_data(merge_request, action, old_rev: old_rev, old_associations: old_associations)
merge_request.project.execute_hooks(merge_data, :merge_request_hooks) merge_request.project.execute_hooks(merge_data, :merge_request_hooks)
merge_request.project.execute_services(merge_data, :merge_request_hooks) merge_request.project.execute_services(merge_data, :merge_request_hooks)
end end
end
def cleanup_environments(merge_request) def cleanup_environments(merge_request)
Ci::StopEnvironmentsService.new(merge_request.source_project, current_user) Ci::StopEnvironmentsService.new(merge_request.source_project, current_user)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment