summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-08-30 18:39:25 -0300
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-08-31 18:34:45 -0300
commitdd64f8aaf867516043dbbf559595a0ed9671ab3b (patch)
treed1495d61b611868371679cfa53a6a94a633a3b49 /app/models
parenta103a5d9cc2f496854d75492fe3f759fad0a913f (diff)
downloadgitlab-ce-dd64f8aaf867516043dbbf559595a0ed9671ab3b.tar.gz
Add option to confidential issues events to trigger services
Diffstat (limited to 'app/models')
-rw-r--r--app/models/project_services/hipchat_service.rb2
-rw-r--r--app/models/project_services/slack_service.rb2
-rw-r--r--app/models/service.rb3
3 files changed, 4 insertions, 3 deletions
diff --git a/app/models/project_services/hipchat_service.rb b/app/models/project_services/hipchat_service.rb
index d7c986c1a91..afebd3b6a12 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 issue confidential_issue merge_request note tag_push build)
end
def execute(data)
diff --git a/app/models/project_services/slack_service.rb b/app/models/project_services/slack_service.rb
index abbc780dc1a..e6c943db2bf 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 issue confidential_issue merge_request note tag_push build wiki_page)
end
def execute(data)
diff --git a/app/models/service.rb b/app/models/service.rb
index 09b4717a523..7333f8d381b 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -7,6 +7,7 @@ class Service < ActiveRecord::Base
default_value_for :active, false
default_value_for :push_events, true
default_value_for :issues_events, true
+ default_value_for :confidential_issues_events, true
default_value_for :merge_requests_events, true
default_value_for :tag_push_events, true
default_value_for :note_events, true
@@ -100,7 +101,7 @@ class Service < ActiveRecord::Base
end
def supported_events
- %w(push tag_push issue merge_request wiki_page)
+ %w(push tag_push issue confidential_issue merge_request wiki_page)
end
def execute(data)