diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-08-12 17:14:11 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-08-12 17:14:11 +0800 |
| commit | 2c06cf98a6dc982caf81c2e4faba195ece9a3b77 (patch) | |
| tree | 25941db89e7481ae2992435291d81649f64a3342 | |
| parent | 9fdcbcb0de414967618cfd7f26141e85805fcb54 (diff) | |
| download | gitlab-ce-2c06cf98a6dc982caf81c2e4faba195ece9a3b77.tar.gz | |
Fix tests. We cannot reload unless it's already saved:
Not sure if this is the right fix...
Or maybe we should actually merge:
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5782
| -rw-r--r-- | app/services/ci/create_pipeline_service.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb index 7398fd8e10a..dabf94fe4c4 100644 --- a/app/services/ci/create_pipeline_service.rb +++ b/app/services/ci/create_pipeline_service.rb @@ -93,7 +93,10 @@ module Ci def error(message, save: false) pipeline.errors.add(:base, message) - pipeline.reload_status! if save + if save + pipeline.save + pipeline.reload_status! + end pipeline end end |