summaryrefslogtreecommitdiff
path: root/spec/models/service_spec.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-03-04 21:57:17 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-03-04 21:57:17 +0000
commit63178a9509f72eb7adf1c73c2fc6dc1ec0a1ea42 (patch)
tree5a925b161c84097e804698aed37de12d1bae12df /spec/models/service_spec.rb
parent00778c073130789e9f65e02e6fa6e8b987506c9e (diff)
parentfc6160816119504e1cea0954453cd557231341a1 (diff)
downloadgitlab-ce-63178a9509f72eb7adf1c73c2fc6dc1ec0a1ea42.tar.gz
Merge branch 'add-more-slack-notifications' into 'master'
Add more Slack notifications for issue and merge request events From https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/237 by Stan Hu. See merge request !1556
Diffstat (limited to 'spec/models/service_spec.rb')
-rw-r--r--spec/models/service_spec.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb
index 9a1248055b1..cc047a20dd2 100644
--- a/spec/models/service_spec.rb
+++ b/spec/models/service_spec.rb
@@ -11,6 +11,10 @@
# active :boolean default(FALSE), not null
# properties :text
# template :boolean default(FALSE)
+# push_events :boolean
+# issues_events :boolean
+# merge_requests_events :boolean
+# tag_push_events :boolean
#
require 'spec_helper'