diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-08-21 14:58:41 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-08-21 14:58:41 +0300 |
| commit | 6017e3b90d49255e8160ae3dd3e09402a18427df (patch) | |
| tree | 2be677505381e913af6d4720b7ecdb93ed94df56 /app/services | |
| parent | e00e62c2c8ddf8d12145660a3478065caab4c4ca (diff) | |
| parent | 13b616e72190518b48cbe6a127b8af92b10b685d (diff) | |
Merge branch 'fix/gb/fix-head-pipeline-when-pipeline-has-errors' into 'master'
Fix merge request head pipeline when pipeline has errors
Closes #36657
See merge request !13664
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/ci/create_pipeline_service.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb index 884b681ff81..d0ba9f89460 100644 --- a/app/services/ci/create_pipeline_service.rb +++ b/app/services/ci/create_pipeline_service.rb @@ -176,9 +176,14 @@ module Ci end def error(message, save: false) - pipeline.errors.add(:base, message) - pipeline.drop if save - pipeline + pipeline.tap do + pipeline.errors.add(:base, message) + + if save + pipeline.drop + update_merge_requests_head_pipeline + end + end end def pipeline_created_counter |