diff options
| author | Gabriel Mazetto <gabriel@gitlab.com> | 2016-04-18 21:53:41 -0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-04-19 11:00:30 +0200 |
| commit | f6fa18668a8618d3677afd15ebbcda41d3329247 (patch) | |
| tree | 0fced0e083e7a9bb7f14967743cfe8d68ece0b9d /app | |
| parent | 5330af3fa69d4c47437ce27480c7f3b74652b2ca (diff) | |
| download | gitlab-ce-f6fa18668a8618d3677afd15ebbcda41d3329247.tar.gz | |
moving overlapping scopes to webhook
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/hooks/project_hook.rb | 2 | ||||
| -rw-r--r-- | app/models/hooks/system_hook.rb | 3 | ||||
| -rw-r--r-- | app/models/hooks/web_hook.rb | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/app/models/hooks/project_hook.rb b/app/models/hooks/project_hook.rb index fe923fafbe0..7365e360de2 100644 --- a/app/models/hooks/project_hook.rb +++ b/app/models/hooks/project_hook.rb @@ -21,8 +21,6 @@ class ProjectHook < WebHook belongs_to :project - scope :push_hooks, -> { where(push_events: true) } - scope :tag_push_hooks, -> { where(tag_push_events: true) } scope :issue_hooks, -> { where(issues_events: true) } scope :note_hooks, -> { where(note_events: true) } scope :merge_request_hooks, -> { where(merge_requests_events: true) } diff --git a/app/models/hooks/system_hook.rb b/app/models/hooks/system_hook.rb index bacd42ec60a..15dddcc2447 100644 --- a/app/models/hooks/system_hook.rb +++ b/app/models/hooks/system_hook.rb @@ -19,9 +19,6 @@ # class SystemHook < WebHook - scope :push_hooks, -> { where(push_events: true) } - scope :tag_push_hooks, -> { where(tag_push_events: true) } - def async_execute(data, hook_name) Sidekiq::Client.enqueue(SystemHookWorker, id, data, hook_name) end diff --git a/app/models/hooks/web_hook.rb b/app/models/hooks/web_hook.rb index 7a13c3f0a39..3a2e4f546f7 100644 --- a/app/models/hooks/web_hook.rb +++ b/app/models/hooks/web_hook.rb @@ -30,6 +30,9 @@ class WebHook < ActiveRecord::Base default_value_for :build_events, false default_value_for :enable_ssl_verification, true + scope :push_hooks, -> { where(push_events: true) } + scope :tag_push_hooks, -> { where(tag_push_events: true) } + # HTTParty timeout default_timeout Gitlab.config.gitlab.webhook_timeout |