diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-15 20:24:19 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-15 20:24:19 +0000 |
| commit | 950fa32a7c2c25d70bf8b2d495d759ce40bf2d9b (patch) | |
| tree | 0215a0fe17940cce0118ab434a5636a0b9c63f9b /app/models/hooks | |
| parent | ffabab80a7b0cebe322aaf9bb2ca8e617a0b790f (diff) | |
| download | gitlab-ce-950fa32a7c2c25d70bf8b2d495d759ce40bf2d9b.tar.gz | |
Revert "Merge branch 'bvl-rename-build-events-to-job-events' into 'master'"
This reverts 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 ee6165fd32d..c631e7a7df5 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 :job_hooks, -> { where(job_events: true) } + scope :build_hooks, -> { where(build_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 a165fdc312f..7cf03aabd6f 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 :job_events, false + default_value_for :build_events, false default_value_for :pipeline_events, false default_value_for :repository_update_events, false default_value_for :enable_ssl_verification, true |