summaryrefslogtreecommitdiff
path: root/app/models/service.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-05-15 15:11:45 +0000
committerBob Van Landuyt <bob@gitlab.com>2017-05-16 14:12:19 +0200
commit1fd83f972cf5ce73b3e46fd2df5ffb07889b1fd1 (patch)
tree5ac1407d05f4ab5b70baa8db65944b44dc8198fd /app/models/service.rb
parentbcc5135ba5c48130fc8afce035726057d0445e5b (diff)
downloadgitlab-ce-1fd83f972cf5ce73b3e46fd2df5ffb07889b1fd1.tar.gz
Merge branch 'bvl-rename-build-events-to-job-events' into 'master' cherry-pick-0663458c
Rename `build_events` to `job_events` Closes #31620 See merge request !11287
Diffstat (limited to 'app/models/service.rb')
-rw-r--r--app/models/service.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/service.rb b/app/models/service.rb
index c71a7d169ec..8916f88076e 100644
--- a/app/models/service.rb
+++ b/app/models/service.rb
@@ -12,7 +12,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 :build_events, true
+ default_value_for :job_events, true
default_value_for :pipeline_events, true
default_value_for :wiki_page_events, true
@@ -40,7 +40,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 :build_hooks, -> { where(build_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) }
scope :external_issue_trackers, -> { issue_trackers.active.without_defaults }