Commit 87f7925c authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Remove unneeded check for merge_request.project

parent 17010a6e
...@@ -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)
......
...@@ -9,7 +9,7 @@ module EE ...@@ -9,7 +9,7 @@ module EE
def execute_hooks(merge_request, action = 'open', old_rev: nil, old_associations: {}) def execute_hooks(merge_request, action = 'open', old_rev: nil, old_associations: {})
super super
return unless merge_request.project && jira_subscription_exists? return unless jira_subscription_exists?
if Atlassian::JiraIssueKeyExtractor.has_keys?(merge_request.title, merge_request.description) if Atlassian::JiraIssueKeyExtractor.has_keys?(merge_request.title, merge_request.description)
JiraConnect::SyncMergeRequestWorker.perform_async(merge_request.id) JiraConnect::SyncMergeRequestWorker.perform_async(merge_request.id)
......
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