summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-09-09 19:07:16 +0000
committerRobert Speicher <robert@gitlab.com>2016-09-09 19:07:16 +0000
commit1417437590a347e30b1a3ee96b218f8eaf635366 (patch)
treeab1164a3b378cc552ee31276a6e36dfc0ec2361a
parent0b2a34108d3189aff9a15f30006c270fb84be00e (diff)
parent6953d244f35f9e5ebd36e37a9968b8da0815ba40 (diff)
downloadgitlab-ce-1417437590a347e30b1a3ee96b218f8eaf635366.tar.gz
Merge branch 'enable-pipeline-events-by-default' into 'master'
Enable pipeline events by default This should probably be included in !5620 but missed. See merge request !6278
-rw-r--r--CHANGELOG1
-rw-r--r--app/models/service.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ee69f254134..94bccb729dd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -21,6 +21,7 @@ v 8.12.0 (unreleased)
- Change merge_error column from string to text type
- Reduce contributions calendar data payload (ClemMakesApps)
- Add `web_url` field to issue, merge request, and snippet API objects (Ben Boeckel)
+ - Enable pipeline events by default !6278
- Move parsing of sidekiq ps into helper !6245 (pascalbetz)
- Expose `sha` and `merge_commit_sha` in merge request API (Ben Boeckel)
- Set path for all JavaScript cookies to honor GitLab's subdirectory setting !5627 (Mike Greiling)
diff --git a/app/models/service.rb b/app/models/service.rb
index 198e7247838..80de7175565 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -12,6 +12,7 @@ class Service < ActiveRecord::Base
default_value_for :tag_push_events, true
default_value_for :note_events, true
default_value_for :build_events, true
+ default_value_for :pipeline_events, true
default_value_for :wiki_page_events, true
after_initialize :initialize_properties