diff options
| author | Lin Jen-Shin (godfat) <godfat@godfat.org> | 2017-05-26 22:18:07 +0300 |
|---|---|---|
| committer | Lin Jen-Shin (godfat) <godfat@godfat.org> | 2017-05-26 22:18:07 +0300 |
| commit | b5e8de5c4c202d10ef8b48248b12f49c1330d04a (patch) | |
| tree | e034bee79723e84eab1e9257c3848d4c991d5333 /spec/models/ci | |
| parent | 8f44bc4dc10caf3c9856a8e4bea5ac145a315131 (diff) | |
| parent | 3605e4307ddf373071c0353a066c50fcead01e45 (diff) | |
Merge branch 'master' into '24196-protected-variables'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'spec/models/ci')
| -rw-r--r-- | spec/models/ci/pipeline_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb index 56b24ce62f3..c8023dc13b1 100644 --- a/spec/models/ci/pipeline_spec.rb +++ b/spec/models/ci/pipeline_spec.rb @@ -965,7 +965,7 @@ describe Ci::Pipeline, models: true do end before do - ProjectWebHookWorker.drain + WebHookWorker.drain end context 'with pipeline hooks enabled' do |