diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2016-10-06 11:42:35 +0300 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2016-10-06 11:42:35 +0300 |
commit | 0bbeff3d5e6c1b5ea3b364f052ed6f777c3aa645 (patch) | |
tree | c6c96df68d5666875b1c141be191448fa55aa510 /spec/models | |
parent | f90b5d5d438e77a6e849f1cc2a3b27fd1dac7ec4 (diff) | |
parent | 7f270d041da55e1fd5c378dcf2291ba752a9114d (diff) |
Merge branch 'feature/improve-async-pipeline-processing' into 'master'
Improve asynchronous pipeline processing
## What does this MR do?
This MR improves asynchronous processing of pipeline.
## Why was this MR needed?
It eliminates some race conditions and improves performance.
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
## What are the relevant issue / merge request numbers?
Related merge request: !6410
Extracted from !6411
See merge request !6650
Diffstat (limited to 'spec/models')
-rw-r--r-- | spec/models/project_services/hipchat_service_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/project_services/hipchat_service_spec.rb b/spec/models/project_services/hipchat_service_spec.rb index cf713684463..26dd95bdfec 100644 --- a/spec/models/project_services/hipchat_service_spec.rb +++ b/spec/models/project_services/hipchat_service_spec.rb @@ -283,7 +283,7 @@ describe HipchatService, models: true do context 'build events' do let(:pipeline) { create(:ci_empty_pipeline) } let(:build) { create(:ci_build, pipeline: pipeline) } - let(:data) { Gitlab::DataBuilder::Build.build(build) } + let(:data) { Gitlab::DataBuilder::Build.build(build.reload) } context 'for failed' do before { build.drop } |