diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-15 15:11:45 +0000 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-05-16 14:12:19 +0200 |
| commit | 1fd83f972cf5ce73b3e46fd2df5ffb07889b1fd1 (patch) | |
| tree | 5ac1407d05f4ab5b70baa8db65944b44dc8198fd /app/models/ci/build.rb | |
| parent | bcc5135ba5c48130fc8afce035726057d0445e5b (diff) | |
| download | gitlab-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/ci/build.rb')
| -rw-r--r-- | app/models/ci/build.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 3c4a4d93349..760ec8e5919 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -300,8 +300,8 @@ module Ci def execute_hooks return unless project build_data = Gitlab::DataBuilder::Build.build(self) - project.execute_hooks(build_data.dup, :build_hooks) - project.execute_services(build_data.dup, :build_hooks) + project.execute_hooks(build_data.dup, :job_hooks) + project.execute_services(build_data.dup, :job_hooks) PagesService.new(build_data).execute project.running_or_pending_build_count(force: true) end |