Commit 066fb568 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Align services like in EE for easier merging

parent 0e70fbe3
...@@ -112,7 +112,7 @@ class Service < ActiveRecord::Base ...@@ -112,7 +112,7 @@ class Service < ActiveRecord::Base
def async_execute(data) def async_execute(data)
return unless supported_events.include?(data[:object_kind]) return unless supported_events.include?(data[:object_kind])
Sidekiq::Client.enqueue(ProjectServiceWorker, id, data) Sidekiq::Client.enqueue(ProjectServiceWorker, id, data)
end end
...@@ -121,9 +121,27 @@ class Service < ActiveRecord::Base ...@@ -121,9 +121,27 @@ class Service < ActiveRecord::Base
end end
def self.available_services_names def self.available_services_names
%w(gitlab_ci campfire hipchat pivotaltracker flowdock assembla asana %w(
emails_on_push gemnasium slack pushover buildbox bamboo teamcity jira gitlab_ci
redmine custom_issue_tracker irker) campfire
hipchat
pivotaltracker
flowdock
assembla
asana
emails_on_push
gemnasium
slack
pushover
buildbox
bamboo
teamcity
jira
redmine
custom_issue_tracker
irker
external_wiki_service
)
end end
def self.create_from_template(project_id, template) def self.create_from_template(project_id, template)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment