summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-08-17 23:09:41 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-08-17 23:09:41 +0800
commit3268583066ead1c6ad4d3d618e77f8e7068ddd5f (patch)
tree736038757a7b7488a31773f5b561af0207e39ca3
parent8c78d991c576912c6703f97db251744bf50a0f4f (diff)
downloadgitlab-ce-3268583066ead1c6ad4d3d618e77f8e7068ddd5f.tar.gz
Make the event name consistent from what we're storing
-rw-r--r--app/models/project_services/asana_service.rb2
-rw-r--r--app/models/project_services/assembla_service.rb2
-rw-r--r--app/models/project_services/bamboo_service.rb2
-rw-r--r--app/models/project_services/buildkite_service.rb2
-rw-r--r--app/models/project_services/builds_email_service.rb2
-rw-r--r--app/models/project_services/campfire_service.rb4
-rw-r--r--app/models/project_services/ci_service.rb2
-rw-r--r--app/models/project_services/drone_ci_service.rb2
-rw-r--r--app/models/project_services/emails_on_push_service.rb10
-rw-r--r--app/models/project_services/flowdock_service.rb2
-rw-r--r--app/models/project_services/gemnasium_service.rb2
-rw-r--r--app/models/project_services/hipchat_service.rb2
-rw-r--r--app/models/project_services/irker_service.rb2
-rw-r--r--app/models/project_services/issue_tracker_service.rb2
-rw-r--r--app/models/project_services/pivotaltracker_service.rb2
-rw-r--r--app/models/project_services/pushover_service.rb2
-rw-r--r--app/models/project_services/slack_service.rb2
-rw-r--r--app/models/project_services/teamcity_service.rb2
-rw-r--r--app/models/service.rb2
19 files changed, 24 insertions, 24 deletions
diff --git a/app/models/project_services/asana_service.rb b/app/models/project_services/asana_service.rb
index 7c23b766763..f779108c890 100644
--- a/app/models/project_services/asana_service.rb
+++ b/app/models/project_services/asana_service.rb
@@ -45,7 +45,7 @@ http://app.asana.com/-/account_api'
end
def supported_events
- %w(push)
+ %w[push]
end
def client
diff --git a/app/models/project_services/assembla_service.rb b/app/models/project_services/assembla_service.rb
index d839221d315..6bc1c94ce24 100644
--- a/app/models/project_services/assembla_service.rb
+++ b/app/models/project_services/assembla_service.rb
@@ -24,7 +24,7 @@ class AssemblaService < Service
end
def supported_events
- %w(push)
+ %w[push]
end
def execute(data)
diff --git a/app/models/project_services/bamboo_service.rb b/app/models/project_services/bamboo_service.rb
index b5c76e4d4fe..3eb2994b645 100644
--- a/app/models/project_services/bamboo_service.rb
+++ b/app/models/project_services/bamboo_service.rb
@@ -55,7 +55,7 @@ class BambooService < CiService
end
def supported_events
- %w(push)
+ %w[push]
end
def build_info(sha)
diff --git a/app/models/project_services/buildkite_service.rb b/app/models/project_services/buildkite_service.rb
index 86a06321e21..ca6ed78da45 100644
--- a/app/models/project_services/buildkite_service.rb
+++ b/app/models/project_services/buildkite_service.rb
@@ -22,7 +22,7 @@ class BuildkiteService < CiService
end
def supported_events
- %w(push)
+ %w[push]
end
def execute(data)
diff --git a/app/models/project_services/builds_email_service.rb b/app/models/project_services/builds_email_service.rb
index fa66e5864b8..311addfd36f 100644
--- a/app/models/project_services/builds_email_service.rb
+++ b/app/models/project_services/builds_email_service.rb
@@ -24,7 +24,7 @@ class BuildsEmailService < Service
end
def supported_events
- %w(build)
+ %w[build]
end
def execute(push_data)
diff --git a/app/models/project_services/campfire_service.rb b/app/models/project_services/campfire_service.rb
index 5af93860d09..8d718cd6cbc 100644
--- a/app/models/project_services/campfire_service.rb
+++ b/app/models/project_services/campfire_service.rb
@@ -25,7 +25,7 @@ class CampfireService < Service
end
def supported_events
- %w(push)
+ %w[push]
end
def execute(data)
@@ -76,7 +76,7 @@ class CampfireService < Service
# Returns a list of rooms, or [].
# https://github.com/basecamp/campfire-api/blob/master/sections/rooms.md#get-rooms
def rooms(auth)
- res = self.class.get("/rooms.json", auth)
+ res = self.class.get("/rooms.json", auth)
res.code == 200 ? res["rooms"] : []
end
diff --git a/app/models/project_services/ci_service.rb b/app/models/project_services/ci_service.rb
index 596c00705ad..2e769e3eede 100644
--- a/app/models/project_services/ci_service.rb
+++ b/app/models/project_services/ci_service.rb
@@ -9,7 +9,7 @@ class CiService < Service
end
def supported_events
- %w(push)
+ %w[push]
end
def merge_request_page(iid, sha, ref)
diff --git a/app/models/project_services/drone_ci_service.rb b/app/models/project_services/drone_ci_service.rb
index 5e4dd101c53..efff390de1c 100644
--- a/app/models/project_services/drone_ci_service.rb
+++ b/app/models/project_services/drone_ci_service.rb
@@ -30,7 +30,7 @@ class DroneCiService < CiService
end
def supported_events
- %w(push merge_request tag_push)
+ %w[push merge_requests tag_push]
end
def merge_request_status_path(iid, sha = nil, ref = nil)
diff --git a/app/models/project_services/emails_on_push_service.rb b/app/models/project_services/emails_on_push_service.rb
index e0083c43adb..19074ec66c3 100644
--- a/app/models/project_services/emails_on_push_service.rb
+++ b/app/models/project_services/emails_on_push_service.rb
@@ -17,17 +17,17 @@ class EmailsOnPushService < Service
end
def supported_events
- %w(push tag_push)
+ %w[push tag_push]
end
def execute(push_data)
return unless supported_events.include?(push_data[:object_kind])
EmailsOnPushWorker.perform_async(
- project_id,
- recipients,
- push_data,
- send_from_committer_email: send_from_committer_email?,
+ project_id,
+ recipients,
+ push_data,
+ send_from_committer_email: send_from_committer_email?,
disable_diffs: disable_diffs?
)
end
diff --git a/app/models/project_services/flowdock_service.rb b/app/models/project_services/flowdock_service.rb
index dd00275187f..7a207e500b1 100644
--- a/app/models/project_services/flowdock_service.rb
+++ b/app/models/project_services/flowdock_service.rb
@@ -23,7 +23,7 @@ class FlowdockService < Service
end
def supported_events
- %w(push)
+ %w[push]
end
def execute(data)
diff --git a/app/models/project_services/gemnasium_service.rb b/app/models/project_services/gemnasium_service.rb
index 598aca5e06d..8e7babbeded 100644
--- a/app/models/project_services/gemnasium_service.rb
+++ b/app/models/project_services/gemnasium_service.rb
@@ -24,7 +24,7 @@ class GemnasiumService < Service
end
def supported_events
- %w(push)
+ %w[push]
end
def execute(data)
diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb
index d7c986c1a91..4d6fbdc9d6f 100644
--- a/app/models/project_services/hipchat_service.rb
+++ b/app/models/project_services/hipchat_service.rb
@@ -39,7 +39,7 @@ class HipchatService < Service
end
def supported_events
- %w(push issue merge_request note tag_push build)
+ %w[push issues merge_requests note tag_push build]
end
def execute(data)
diff --git a/app/models/project_services/irker_service.rb b/app/models/project_services/irker_service.rb
index ce7d1c5d5b1..2834bda3bd2 100644
--- a/app/models/project_services/irker_service.rb
+++ b/app/models/project_services/irker_service.rb
@@ -21,7 +21,7 @@ class IrkerService < Service
end
def supported_events
- %w(push)
+ %w[push]
end
def execute(data)
diff --git a/app/models/project_services/issue_tracker_service.rb b/app/models/project_services/issue_tracker_service.rb
index d1df6d0292f..210df69edab 100644
--- a/app/models/project_services/issue_tracker_service.rb
+++ b/app/models/project_services/issue_tracker_service.rb
@@ -48,7 +48,7 @@ class IssueTrackerService < Service
end
def supported_events
- %w(push)
+ %w[push]
end
def execute(data)
diff --git a/app/models/project_services/pivotaltracker_service.rb b/app/models/project_services/pivotaltracker_service.rb
index 5301f9fa0ff..a1dab7dace0 100644
--- a/app/models/project_services/pivotaltracker_service.rb
+++ b/app/models/project_services/pivotaltracker_service.rb
@@ -35,7 +35,7 @@ class PivotaltrackerService < Service
end
def supported_events
- %w(push)
+ %w[push]
end
def execute(data)
diff --git a/app/models/project_services/pushover_service.rb b/app/models/project_services/pushover_service.rb
index 3dd878e4c7d..2a5639cbdcb 100644
--- a/app/models/project_services/pushover_service.rb
+++ b/app/models/project_services/pushover_service.rb
@@ -62,7 +62,7 @@ class PushoverService < Service
end
def supported_events
- %w(push)
+ %w[push]
end
def execute(data)
diff --git a/app/models/project_services/slack_service.rb b/app/models/project_services/slack_service.rb
index abbc780dc1a..daf3c049fda 100644
--- a/app/models/project_services/slack_service.rb
+++ b/app/models/project_services/slack_service.rb
@@ -44,7 +44,7 @@ class SlackService < Service
end
def supported_events
- %w(push issue merge_request note tag_push build wiki_page)
+ %w[push issues merge_requests note tag_push build wiki_page]
end
def execute(data)
diff --git a/app/models/project_services/teamcity_service.rb b/app/models/project_services/teamcity_service.rb
index a4a967c9bc9..7a6f8821d04 100644
--- a/app/models/project_services/teamcity_service.rb
+++ b/app/models/project_services/teamcity_service.rb
@@ -46,7 +46,7 @@ class TeamcityService < CiService
end
def supported_events
- %w(push)
+ %w[push]
end
def fields
diff --git a/app/models/service.rb b/app/models/service.rb
index 09b4717a523..b435a37cd27 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -100,7 +100,7 @@ class Service < ActiveRecord::Base
end
def supported_events
- %w(push tag_push issue merge_request wiki_page)
+ %w[push tag_push issues merge_requests wiki_page]
end
def execute(data)