diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 21:08:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 21:08:11 +0300 |
| commit | 8a7efa45c38ed3200d173d2c3207a8154e583c16 (patch) | |
| tree | 1bb4d579b95c79aae4946a06fefa089e5549b722 /app/models/ci | |
| parent | 53b1f4eaa2a451aaba908a5fee7ce97a930021ac (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/ci')
| -rw-r--r-- | app/models/ci/legacy_stage.rb | 2 | ||||
| -rw-r--r-- | app/models/ci/pipeline.rb | 2 | ||||
| -rw-r--r-- | app/models/ci/stage.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/models/ci/legacy_stage.rb b/app/models/ci/legacy_stage.rb index 0a67a652e22..9ca5cf13907 100644 --- a/app/models/ci/legacy_stage.rb +++ b/app/models/ci/legacy_stage.rb @@ -32,7 +32,7 @@ module Ci end def status - @status ||= statuses.latest.slow_composite_status + @status ||= statuses.latest.slow_composite_status(project: project) end def detailed_status(current_user) diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb index 4e9be86d3a9..3ce44a066ae 100644 --- a/app/models/ci/pipeline.rb +++ b/app/models/ci/pipeline.rb @@ -968,7 +968,7 @@ module Ci def latest_builds_status return 'failed' unless yaml_errors.blank? - statuses.latest.slow_composite_status || 'skipped' + statuses.latest.slow_composite_status(project: project) || 'skipped' end def keep_around_commits diff --git a/app/models/ci/stage.rb b/app/models/ci/stage.rb index 75f73429c2a..e6c34f3df03 100644 --- a/app/models/ci/stage.rb +++ b/app/models/ci/stage.rb @@ -138,7 +138,7 @@ module Ci end def latest_stage_status - statuses.latest.slow_composite_status || 'skipped' + statuses.latest.slow_composite_status(project: project) || 'skipped' end end end |