diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-08-11 18:10:28 +0300 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-08-11 18:10:28 +0300 |
commit | 0b0a53ee5ec3782c6c7e166f69f190e820232fb0 (patch) | |
tree | b2cd0518594a933ec2c68c2f883026bb82da3569 /app/services/git_push_service.rb | |
parent | 0b52517049fc8ac01407018c8a6225d7788861a3 (diff) | |
parent | 4c29c25497c9a20a5d1f57cd287123cd41edad96 (diff) |
Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slack
# Conflicts:
# app/models/ci/pipeline.rb
# app/services/ci/create_pipeline_service.rb
# spec/models/project_services/hipchat_service_spec.rb
Diffstat (limited to 'app/services/git_push_service.rb')
-rw-r--r-- | app/services/git_push_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb index 473eb5d902f..b7c5cfb58b4 100644 --- a/app/services/git_push_service.rb +++ b/app/services/git_push_service.rb @@ -69,7 +69,7 @@ class GitPushService < BaseService SystemHooksService.new.execute_hooks(build_push_data_system_hook.dup, :push_hooks) @project.execute_hooks(build_push_data.dup, :push_hooks) @project.execute_services(build_push_data.dup, :push_hooks) - CreateCommitBuildsService.new.execute(@project, current_user, build_push_data) + Ci::CreatePipelineService.new(project, current_user, build_push_data).execute ProjectCacheWorker.perform_async(@project.id) end |