diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-07-29 17:06:09 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-07-29 17:56:11 +0800 |
| commit | d41e83e91a2b2c90ab51feda61e105818e1713be (patch) | |
| tree | 1cd9cf92f03eba4c6a0694eb81d4d08f06b22e2d | |
| parent | b831ef716b088fa5f0892ececd00d4a383267979 (diff) | |
| download | gitlab-ce-d41e83e91a2b2c90ab51feda61e105818e1713be.tar.gz | |
Don't execute hooks if ci was supposed to be skipped
And we should preserve the return value
| -rw-r--r-- | app/models/ci/pipeline.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index cd6ead4ded2..4e6ccf48c68 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -237,8 +237,9 @@ module Ci self.started_at = statuses.started_at self.finished_at = statuses.finished_at self.duration = statuses.latest.duration - save - execute_hooks + saved = save + execute_hooks if saved && !skip_ci? + saved end def execute_hooks |