Merge branch 'master' into markdown-tags

Merge updated CHANGELOG entries

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)