diff options
author | Vinnie Okada <vokada@mrvinn.com> | 2015-03-21 18:03:35 +0300 |
---|---|---|
committer | Vinnie Okada <vokada@mrvinn.com> | 2015-03-21 18:03:35 +0300 |
commit | f5e65e2e508269ff7c18318526ba01f8e7d83951 (patch) | |
tree | dd834b066dc51de87139d69ea042e0bdfd69334d /app/models/service.rb | |
parent | cc29ce491786d631586c3b0d0da310b8b790a673 (diff) | |
parent | 6cf189f0a92772b9174f913e7c74a4889d54e9a6 (diff) |
Merge branch 'master' into markdown-tags
Merge updated CHANGELOG entries
Diffstat (limited to 'app/models/service.rb')
-rw-r--r-- | app/models/service.rb | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/app/models/service.rb b/app/models/service.rb index 33734e97c55..f54ad19666b 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 + ) end def self.create_from_template(project_id, template) |