summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-17 19:06:43 -0700
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-17 19:06:43 -0700
commit066fb568e7b8ee7d04e934a82171fece48768034 (patch)
treee92140881539df60aee7649e67d0c064aeb18986
parent0e70fbe3338ad18e6d08fe1c5d487582f48642d4 (diff)
downloadgitlab-ce-066fb568e7b8ee7d04e934a82171fece48768034.tar.gz
Align services like in EE for easier merging
-rw-r--r--app/models/service.rb26
1 files changed, 22 insertions, 4 deletions
diff --git a/app/models/service.rb b/app/models/service.rb
index 33734e97c55..918af88b393 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -112,7 +112,7 @@ class Service < ActiveRecord::Base
def async_execute(data)
return unless supported_events.include?(data[:object_kind])
-
+
Sidekiq::Client.enqueue(ProjectServiceWorker, id, data)
end
@@ -121,9 +121,27 @@ class Service < ActiveRecord::Base
end
def self.available_services_names
- %w(gitlab_ci campfire hipchat pivotaltracker flowdock assembla asana
- emails_on_push gemnasium slack pushover buildbox bamboo teamcity jira
- redmine custom_issue_tracker irker)
+ %w(
+ gitlab_ci
+ 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
def self.create_from_template(project_id, template)