diff options
| author | Alexis Reigel <alexis.reigel.ext@siemens.com> | 2017-12-04 13:18:54 +0300 |
|---|---|---|
| committer | Alexis Reigel <alexis.reigel.ext@siemens.com> | 2018-01-17 11:55:00 +0300 |
| commit | ac92d70d9025e1c90bffa99c08bfc4cdb2fc36c9 (patch) | |
| tree | 5363b42dbe41a07759558eed33fe0f1193d00b61 /app/models/hooks | |
| parent | 88832ba9392d4521b7de003e6d7ea88c59f2d579 (diff) | |
extract concern for hook triggers
Diffstat (limited to 'app/models/hooks')
| -rw-r--r-- | app/models/hooks/project_hook.rb | 26 | ||||
| -rw-r--r-- | app/models/hooks/system_hook.rb | 16 |
2 files changed, 19 insertions, 23 deletions
diff --git a/app/models/hooks/project_hook.rb b/app/models/hooks/project_hook.rb index a8c424a6614..110389d5d86 100644 --- a/app/models/hooks/project_hook.rb +++ b/app/models/hooks/project_hook.rb @@ -1,19 +1,17 @@ class ProjectHook < WebHook - TRIGGERS = { - push_hooks: :push_events, - tag_push_hooks: :tag_push_events, - issue_hooks: :issues_events, - confidential_issue_hooks: :confidential_issues_events, - note_hooks: :note_events, - merge_request_hooks: :merge_requests_events, - job_hooks: :job_events, - pipeline_hooks: :pipeline_events, - wiki_page_hooks: :wiki_page_events - }.freeze + include TriggerableHooks - TRIGGERS.each do |trigger, event| - scope trigger, -> { where(event => true) } - end + triggerable_hooks only: [ + :push_hooks, + :tag_push_hooks, + :issue_hooks, + :confidential_issue_hooks, + :note_hooks, + :merge_request_hooks, + :job_hooks, + :pipeline_hooks, + :wiki_page_hooks + ] belongs_to :project validates :project, presence: true diff --git a/app/models/hooks/system_hook.rb b/app/models/hooks/system_hook.rb index 78b053f36c3..d8d8670d5b1 100644 --- a/app/models/hooks/system_hook.rb +++ b/app/models/hooks/system_hook.rb @@ -1,14 +1,12 @@ class SystemHook < WebHook - TRIGGERS = { - repository_update_hooks: :repository_update_events, - push_hooks: :push_events, - tag_push_hooks: :tag_push_events, - merge_request_hooks: :merge_requests_events - }.freeze + include TriggerableHooks - TRIGGERS.each do |trigger, event| - scope trigger, -> { where(event => true) } - end + triggerable_hooks only: [ + :repository_update_hooks, + :push_hooks, + :tag_push_hooks, + :merge_request_hooks + ] default_value_for :push_events, false default_value_for :repository_update_events, true |