diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-15 18:11:45 +0300 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-05-16 15:12:19 +0300 |
| commit | 1fd83f972cf5ce73b3e46fd2df5ffb07889b1fd1 (patch) | |
| tree | 5ac1407d05f4ab5b70baa8db65944b44dc8198fd /app/models/hooks | |
| parent | bcc5135ba5c48130fc8afce035726057d0445e5b (diff) | |
Merge branch 'bvl-rename-build-events-to-job-events' into 'master'
Rename `build_events` to `job_events`
Closes #31620
See merge request !11287
Diffstat (limited to 'app/models/hooks')
| -rw-r--r-- | app/models/hooks/project_hook.rb | 2 | ||||
| -rw-r--r-- | app/models/hooks/web_hook.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/hooks/project_hook.rb b/app/models/hooks/project_hook.rb index c631e7a7df5..ee6165fd32d 100644 --- a/app/models/hooks/project_hook.rb +++ b/app/models/hooks/project_hook.rb @@ -5,7 +5,7 @@ class ProjectHook < WebHook scope :confidential_issue_hooks, -> { where(confidential_issues_events: true) } scope :note_hooks, -> { where(note_events: true) } scope :merge_request_hooks, -> { where(merge_requests_events: true) } - scope :build_hooks, -> { where(build_events: true) } + scope :job_hooks, -> { where(job_events: true) } scope :pipeline_hooks, -> { where(pipeline_events: true) } scope :wiki_page_hooks, -> { where(wiki_page_events: true) } end diff --git a/app/models/hooks/web_hook.rb b/app/models/hooks/web_hook.rb index 7cf03aabd6f..a165fdc312f 100644 --- a/app/models/hooks/web_hook.rb +++ b/app/models/hooks/web_hook.rb @@ -8,7 +8,7 @@ class WebHook < ActiveRecord::Base default_value_for :note_events, false default_value_for :merge_requests_events, false default_value_for :tag_push_events, false - default_value_for :build_events, false + default_value_for :job_events, false default_value_for :pipeline_events, false default_value_for :repository_update_events, false default_value_for :enable_ssl_verification, true |