diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-16 12:09:12 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-16 12:09:12 +0000 |
| commit | cbfe03ae04a52d9825ff7cbeccdfe5d313adf6a2 (patch) | |
| tree | e4879b35d019d3bbba1689f3ac4c48b81bf7b451 /app/services/ci | |
| parent | 3fd97b4bba24ca412112aad025a38a32c7a6cf8c (diff) | |
| download | gitlab-ce-cbfe03ae04a52d9825ff7cbeccdfe5d313adf6a2.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/ci')
| -rw-r--r-- | app/services/ci/update_ci_ref_status_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/ci/update_ci_ref_status_service.rb b/app/services/ci/update_ci_ref_status_service.rb index e5e5b94b629..4f7ac4d11b0 100644 --- a/app/services/ci/update_ci_ref_status_service.rb +++ b/app/services/ci/update_ci_ref_status_service.rb @@ -22,7 +22,7 @@ module Ci begin retry_optimistic_lock(ref) do next false if ref.persisted? && - (ref.last_updated_by_pipeline_id || 0) >= pipeline.id + (ref.last_updated_by_pipeline_id || 0) > pipeline.id ref.update(status: next_status(ref.status, pipeline.status), last_updated_by_pipeline: pipeline) |