summaryrefslogtreecommitdiff
path: root/app/models/project_services/jira_service.rb
diff options
context:
space:
mode:
authorTiago Botelho <tiagonbotelho@hotmail.com>2016-12-27 12:44:24 +0000
committerTiago Botelho <tiagonbotelho@hotmail.com>2017-01-22 00:02:29 +0000
commitcd51af1a991eaa5e16e3c6b94c89d90e20a5641f (patch)
tree487d4facff51567ab73121aed9f3fec29d7aad8f /app/models/project_services/jira_service.rb
parent4b7ec44b91e0571d209c790d54947ba1756dac0e (diff)
downloadgitlab-ce-cd51af1a991eaa5e16e3c6b94c89d90e20a5641f.tar.gz
adds events to services api deserialization
Diffstat (limited to 'app/models/project_services/jira_service.rb')
-rw-r--r--app/models/project_services/jira_service.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb
index 2d969d2fcb6..46291f2dcc0 100644
--- a/app/models/project_services/jira_service.rb
+++ b/app/models/project_services/jira_service.rb
@@ -12,10 +12,14 @@ class JiraService < IssueTrackerService
# This is confusing, but JiraService does not really support these events.
# The values here are required to display correct options in the service
# configuration screen.
- def supported_events
+ def self.supported_events
%w(commit merge_request)
end
+ def self.event_names
+ self.supported_events.map { |event| "#{event}_events" }
+ end
+
# {PROJECT-KEY}-{NUMBER} Examples: JIRA-1, PROJECT-1
def reference_pattern
@reference_pattern ||= %r{(?<issue>\b([A-Z][A-Z0-9_]+-)\d+)}
@@ -81,7 +85,7 @@ class JiraService < IssueTrackerService
end
end
- def to_param
+ def self.to_param
'jira'
end