diff options
author | Sean McGivern <sean@gitlab.com> | 2016-10-17 10:56:55 +0100 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2016-10-17 10:56:55 +0100 |
commit | 86dcb79be37f5759dfeaa26283ed8bf031b38d54 (patch) | |
tree | 70869aeaa6bfbdcaada873cfd3e4054c62d3e25a /app/models/ci/pipeline.rb | |
parent | 26e327ea93140f6400b965b845958ff50461718c (diff) | |
parent | 052de0600c6b137e6f9df08250b4cf5f38280295 (diff) | |
download | gitlab-ce-86dcb79be37f5759dfeaa26283ed8bf031b38d54.tar.gz |
Merge branch 'master' into merge-conflicts-editor-2
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 957f6755b2e..4fdb5fef4fb 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -76,7 +76,11 @@ module Ci end after_transition do |pipeline, transition| - pipeline.execute_hooks unless transition.loopback? + next if transition.loopback? + + pipeline.run_after_commit do + PipelineHooksWorker.perform_async(id) + end end end |