diff options
| author | Lin Jen-Shin (godfat) <godfat@godfat.org> | 2017-05-26 19:18:25 +0000 |
|---|---|---|
| committer | Lin Jen-Shin (godfat) <godfat@godfat.org> | 2017-05-26 19:18:25 +0000 |
| commit | 0e5ee119b7f037b7ce9e84d20306d0acfcd320cd (patch) | |
| tree | 3011f2c7584a9f037c05219b13fe5923ddda4c17 /spec/models/ci | |
| parent | 88ba7a034be6c2a93c495edd1d1db08ec6d98bb3 (diff) | |
| parent | 3605e4307ddf373071c0353a066c50fcead01e45 (diff) | |
| download | gitlab-ce-0e5ee119b7f037b7ce9e84d20306d0acfcd320cd.tar.gz | |
Merge branch 'master' into '25680-CI_ENVIRONMENT_URL'
# 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 |