Don't execute hooks if ci was supposed to be skipped

And we should preserve the return value

Don't execute hooks if ci was supposed to be skipped
And we should preserve the return value
d41e83e9 · Lin Jen-Shin · b831ef71 · d41e83e9
Commit d41e83e9 authored Jul 29, 2016 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

app/models/ci/pipeline.rb app/models/ci/pipeline.rb +3 -2

No files found.
--- 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
+      saved = save
-      execute_hooks
+      execute_hooks if saved && !skip_ci?
+      saved
    end
    def execute_hooks