Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 3 insertions, 15 deletions

diff --git a/app/services/resource_events/change_state_service.rb b/app/services/resource_events/change_state_service.rb
index 202972c1efd..cd6d82df46f 100644
--- a/app/services/resource_events/change_state_service.rb
+++ b/app/services/resource_events/change_state_service.rb
@@ -13,14 +13,14 @@ module ResourceEvents
 
       ResourceStateEvent.create(
         user: user,
-        issue: issue,
-        merge_request: merge_request,
+        resource.class.underscore => resource,
         source_commit: commit_id_of(mentionable_source),
         source_merge_request_id: merge_request_id_of(mentionable_source),
         state: ResourceStateEvent.states[state],
         close_after_error_tracking_resolve: close_after_error_tracking_resolve,
         close_auto_resolve_prometheus_alert: close_auto_resolve_prometheus_alert,
-        created_at: Time.zone.now)
+        created_at: Time.zone.now
+      )
 
       resource.expire_note_etag_cache
     end
@@ -56,17 +56,5 @@ module ResourceEvents
 
       mentionable_source.id
     end
-
-    def issue
-      return unless resource.is_a?(Issue)
-
-      resource
-    end
-
-    def merge_request
-      return unless resource.is_a?(MergeRequest)
-
-      resource
-    end
   end
 end