diff options
author | Stan Hu <stanhu@gmail.com> | 2019-06-17 22:43:50 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-06-17 22:43:50 +0000 |
commit | 7c27155c453f4cc4382424bbd1d84813a2c86b10 (patch) | |
tree | 7ded8752e87ba1f015c10b7dfe45359659b91d7e /app | |
parent | 12d262c23f5a783106c08cd385ecb86ccb4b899c (diff) | |
parent | 4a71db7b3d30922d9d5f8015f54d45dee0ffc60e (diff) | |
download | gitlab-ce-7c27155c453f4cc4382424bbd1d84813a2c86b10.tar.gz |
Merge branch '56737-commits-and-mr-events-on-jira-api' into 'master'
Expose currently supported events properly on services API
Closes #56737
See merge request gitlab-org/gitlab-ce!29736
Diffstat (limited to 'app')
-rw-r--r-- | app/models/service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/service.rb b/app/models/service.rb index 16fbe6648cc..40033003f3b 100644 --- a/app/models/service.rb +++ b/app/models/service.rb @@ -120,7 +120,7 @@ class Service < ApplicationRecord end def self.event_names - self.supported_events.map { |event| "#{event}_events" } + self.supported_events.map { |event| ServicesHelper.service_event_field_name(event) } end def event_field(event) @@ -152,7 +152,7 @@ class Service < ApplicationRecord end def self.supported_events - %w(push tag_push issue confidential_issue merge_request wiki_page) + %w(commit push tag_push issue confidential_issue merge_request wiki_page) end def execute(data) |