Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 7 deletions

diff --git a/app/serializers/integrations/event_entity.rb b/app/serializers/integrations/event_entity.rb
index 170f660f334..f603c0e035e 100644
--- a/app/serializers/integrations/event_entity.rb
+++ b/app/serializers/integrations/event_entity.rb
@@ -18,12 +18,12 @@ module Integrations
       IntegrationsHelper.integration_event_description(integration, event)
     end
 
-    expose :field, if: ->(_, _) { event_field } do
+    expose :field, if: ->(_, _) { integration.try(:configurable_channels?) } do
       expose :name do |event|
-        event_field[:name]
+        integration.event_channel_name(event)
       end
       expose :value do |event|
-        integration.public_send(event_field[:name]) # rubocop:disable GitlabSecurity/PublicSend
+        integration.get_channel_field(event)
       end
     end
 
@@ -35,10 +35,6 @@ module Integrations
       IntegrationsHelper.integration_event_field_name(event)
     end
 
-    def event_field
-      @event_field ||= integration.event_field(event)
-    end
-
     def integration
       request.integration
     end