Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2015-07-03 09:17:10 +0300
committerStan Hu <stanhu@gmail.com>2015-07-05 16:40:56 +0300
commitd4be82d1c938d7d7b3b68bd628f5a24c7664e281 (patch)
tree8cd0e8a79f825ddf6741c8224c714655592bc8e3 /app/controllers/projects/services_controller.rb
parent2ca7ffd094ae285823d1a00b8cf1a7d23b80a2a3 (diff)
Add Irker service configuration options
Closes #1713 Closes #1714 Closes gitlab-com/support-forum#139
Diffstat (limited to 'app/controllers/projects/services_controller.rb')
-rw-r--r--app/controllers/projects/services_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb
index dc18bbd8d5b..1e435be8275 100644
--- a/app/controllers/projects/services_controller.rb
+++ b/app/controllers/projects/services_controller.rb
@@ -7,7 +7,8 @@ class Projects::ServicesController < Projects::ApplicationController
:colorize_messages, :channels,
:push_events, :issues_events, :merge_requests_events, :tag_push_events,
:note_events, :send_from_committer_email, :disable_diffs, :external_wiki_url,
- :notify, :color]
+ :notify, :color,
+ :server_host, :server_port, :default_irc_uri]
# Authorize
before_action :authorize_admin_project!
before_action :service, only: [:edit, :update, :test]