diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 06:09:21 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-17 06:09:21 +0000 |
commit | c8df22c555ab707a705e57c4257fd3ed1ce7c3b0 (patch) | |
tree | 009fb7c1ff12a6192921212cae404b790fd7d66b /app/models/ci/pipeline.rb | |
parent | 9345f69894862e02f3491ea3136c3ed2b23fd5b8 (diff) | |
download | gitlab-ce-c8df22c555ab707a705e57c4257fd3ed1ce7c3b0.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/ci/pipeline.rb')
-rw-r--r-- | app/models/ci/pipeline.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index d841601cf4b..b7bab9bc226 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -236,7 +236,11 @@ module Ci after_transition any => [:success, :failed] do |pipeline| pipeline.run_after_commit do - PipelineUpdateCiRefStatusWorker.perform_async(pipeline.id) + if Feature.enabled?(:ci_pipeline_fixed_notifications) + PipelineUpdateCiRefStatusWorker.perform_async(pipeline.id) + else + PipelineNotificationWorker.perform_async(pipeline.id) + end end end |