Remove unneeded check for merge_request.project

0e274dfc · Heinrich Lee Yu · 1d5f5aa8 · 0e274dfc
Commit 0e274dfc authored Aug 22, 2019 by Heinrich Lee Yu
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

app/services/merge_requests/base_service.rb app/services/merge_requests/base_service.rb +3 -5

No files found.
--- a/app/services/merge_requests/base_service.rb
+++ b/app/services/merge_requests/base_service.rb
@@ -17,11 +17,9 @@ module MergeRequests
    end
    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
    def cleanup_environments(merge_request)