summaryrefslogtreecommitdiff
path: root/app/controllers/admin/services_controller.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-02-25 14:05:45 +0100
committerDouwe Maan <douwe@gitlab.com>2015-02-25 14:20:35 +0100
commite0c186c35735a2dc9e05e88ad9975ae016c815d9 (patch)
treec040a133925106da34de651cb88e155988a079fc /app/controllers/admin/services_controller.rb
parent0e7d1fd44f057c83c5384618f4599271f9fdd006 (diff)
downloadgitlab-ce-e0c186c35735a2dc9e05e88ad9975ae016c815d9.tar.gz
Add option to send EmailsOnPush from committer email if domain matches.
See #1809.
Diffstat (limited to 'app/controllers/admin/services_controller.rb')
-rw-r--r--app/controllers/admin/services_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/admin/services_controller.rb b/app/controllers/admin/services_controller.rb
index e80cabd6e18..88106b2418a 100644
--- a/app/controllers/admin/services_controller.rb
+++ b/app/controllers/admin/services_controller.rb
@@ -45,7 +45,8 @@ class Admin::ServicesController < Admin::ApplicationController
:room, :recipients, :project_url, :webhook,
:user_key, :device, :priority, :sound, :bamboo_url, :username, :password,
:build_key, :server, :teamcity_url, :build_type,
- :description, :issues_url, :new_issue_url, :restrict_to_branch
+ :description, :issues_url, :new_issue_url, :restrict_to_branch,
+ :send_from_committer_email
])
end
end