Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 6 deletions

diff --git a/app/serializers/service_event_entity.rb b/app/serializers/service_event_entity.rb
index eb4f9c665f2..56dfdc794eb 100644
--- a/app/serializers/service_event_entity.rb
+++ b/app/serializers/service_event_entity.rb
@@ -10,11 +10,11 @@ class ServiceEventEntity < Grape::Entity
   expose :event_field_name, as: :name
 
   expose :value do |event|
-    service[event_field_name]
+    integration[event_field_name]
   end
 
   expose :description do |event|
-    ServicesHelper.service_event_description(event)
+    IntegrationsHelper.integration_event_description(event)
   end
 
   expose :field, if: -> (_, _) { event_field } do
@@ -22,7 +22,7 @@ class ServiceEventEntity < Grape::Entity
       event_field[:name]
     end
     expose :value do |event|
-      service.public_send(event_field[:name]) # rubocop:disable GitlabSecurity/PublicSend
+      integration.public_send(event_field[:name]) # rubocop:disable GitlabSecurity/PublicSend
     end
   end
 
@@ -31,14 +31,14 @@ class ServiceEventEntity < Grape::Entity
   alias_method :event, :object
 
   def event_field_name
-    ServicesHelper.service_event_field_name(event)
+    IntegrationsHelper.integration_event_field_name(event)
   end
 
   def event_field
-    @event_field ||= service.event_field(event)
+    @event_field ||= integration.event_field(event)
   end
 
-  def service
+  def integration
     request.service
   end
 end