diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-09-12 17:20:12 +0300 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-09-12 17:20:12 +0300 |
| commit | 985252126de7f98c021f3138a720969696440687 (patch) | |
| tree | 1ecc571076a1ff274339e40f7be5bd9dca098e49 /app/models/service.rb | |
| parent | 5de54a7137ee6de121e5c3477b4901a183b01762 (diff) | |
| parent | 12d4eea4c7a46ad3641f2c3a8ee182a16e4848e5 (diff) | |
Merge remote-tracking branch 'upstream/master' into pipeline-emails
* upstream/master: (671 commits)
Only check :can_resolve permission if the note is resolvable
Use Search::GlobalService.new in the `GET /projects/search/:query` endpoint
Improve PipelinesFinder spec so that it does not depend on hard-coded database IDs
Add changelogs/unreleased/.gitkeep
Archive CHANGELOG entries prior to 8.0 in changelogs/archive.md
Request only the LDAP attributes we need
Add notification_settings API calls Use NotificationSetting::EMAIL_EVENTS for params
Pull import sources from Gitlab::ImportSources
Fix API issues sorting
Use gitlab-workhorse 0.8.1
Update CHANGELOG
Avoid conflict with admin labels when importing GitHub labels
Search should compare only the lowercase versions of the project names
Enable pipeline events by default
Minor update on CI docs examples
Move write_note into SlashCommandsHelper and update other dependent specs
Wait for logout message in login_helpers
Use wait_for_ajax to avoid database deadlocks after specs are cleaned
Fix spec failures with spec/features/issues/user_uses_slash_commands_spec.rb
Require comments must be included before code
...
Diffstat (limited to 'app/models/service.rb')
| -rw-r--r-- | app/models/service.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/models/service.rb b/app/models/service.rb index 754cca07648..2259e05a4e5 100644 --- a/app/models/service.rb +++ b/app/models/service.rb @@ -7,10 +7,12 @@ 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 default_value_for :build_events, true + default_value_for :pipeline_events, true default_value_for :wiki_page_events, true after_initialize :initialize_properties @@ -33,6 +35,7 @@ class Service < ActiveRecord::Base scope :push_hooks, -> { where(push_events: true, active: true) } scope :tag_push_hooks, -> { where(tag_push_events: true, active: true) } scope :issue_hooks, -> { where(issues_events: true, active: true) } + scope :confidential_issue_hooks, -> { where(confidential_issues_events: true, active: true) } scope :merge_request_hooks, -> { where(merge_requests_events: true, active: true) } scope :note_hooks, -> { where(note_events: true, active: true) } scope :build_hooks, -> { where(build_events: true, active: true) } @@ -100,7 +103,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) |