diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
tree | c42be41678c2586d49a75cabce89322082698334 /app/serializers/service_event_entity.rb | |
parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
download | gitlab-ce-e8d2c2579383897a1dd7f9debd359abe8ae8373d.tar.gz |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/serializers/service_event_entity.rb')
-rw-r--r-- | app/serializers/service_event_entity.rb | 12 |
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..a1fbfa1d4c4 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(integration, 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 |