summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2016-08-03 17:33:34 +0800
committerLin Jen-Shin <godfat@godfat.org>2016-08-03 17:33:34 +0800
commitdb123d29e73419e9a3e3fc3afe03fd626ae9d776 (patch)
tree9cde4a758ca5f004b22fceb89a6a9675bcaf7102
parent853b0dffe787aa185d299ac1868619a231b6965b (diff)
downloadgitlab-ce-db123d29e73419e9a3e3fc3afe03fd626ae9d776.tar.gz
More descriptive comments, feedback:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13539571
-rw-r--r--app/controllers/concerns/service_params.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/controllers/concerns/service_params.rb b/app/controllers/concerns/service_params.rb
index 58877c5ad5d..a69877edfd4 100644
--- a/app/controllers/concerns/service_params.rb
+++ b/app/controllers/concerns/service_params.rb
@@ -7,8 +7,12 @@ module ServiceParams
:build_key, :server, :teamcity_url, :drone_url, :build_type,
:description, :issues_url, :new_issue_url, :restrict_to_branch, :channel,
:colorize_messages, :channels,
- # See app/helpers/services_helper.rb
- # for why we need issues_events and merge_requests_events.
+ # We're using `issues_events` and `merge_requests_events`
+ # in the view so we still need to explicitly state them
+ # here. `Service#event_names` would only give
+ # `issue_events` and `merge_request_events` (singular!)
+ # See app/helpers/services_helper.rb for how we
+ # make those event names plural as special case.
:issues_events, :merge_requests_events,
:notify_only_broken_builds, :notify_only_broken_pipelines,
:add_pusher, :send_from_committer_email, :disable_diffs,