diff options
author | Phil Hughes <me@iamphill.com> | 2018-04-07 10:08:34 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-04-07 10:08:34 +0100 |
commit | 4581a78d66a93c6d82b39d1214b75e15681a9960 (patch) | |
tree | 4fecac73aba986ddcce6a82515bf7775d212f986 /app/models/service.rb | |
parent | 690c57867d6dcaaaee15208e9d4de6ec85f19e80 (diff) | |
parent | 671e93dc38365f3b05cb3cfe719e64713196be31 (diff) | |
download | gitlab-ce-4581a78d66a93c6d82b39d1214b75e15681a9960.tar.gz |
Merge branch 'master' into ide-staged-changes
Diffstat (limited to 'app/models/service.rb')
-rw-r--r-- | app/models/service.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/models/service.rb b/app/models/service.rb index 7424cef0fc0..e9b6f005aec 100644 --- a/app/models/service.rb +++ b/app/models/service.rb @@ -14,6 +14,7 @@ class Service < ActiveRecord::Base default_value_for :merge_requests_events, true default_value_for :tag_push_events, true default_value_for :note_events, true + default_value_for :confidential_note_events, true default_value_for :job_events, true default_value_for :pipeline_events, true default_value_for :wiki_page_events, true @@ -42,6 +43,7 @@ class Service < ActiveRecord::Base 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 :confidential_note_hooks, -> { where(confidential_note_events: true, active: true) } scope :job_hooks, -> { where(job_events: true, active: true) } scope :pipeline_hooks, -> { where(pipeline_events: true, active: true) } scope :wiki_page_hooks, -> { where(wiki_page_events: true, active: true) } @@ -168,8 +170,10 @@ class Service < ActiveRecord::Base def self.prop_accessor(*args) args.each do |arg| class_eval %{ - def #{arg} - properties['#{arg}'] + unless method_defined?(arg) + def #{arg} + properties['#{arg}'] + end end def #{arg}=(value) |