summaryrefslogtreecommitdiff
path: root/app/models/commit_status.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-04-02 18:08:11 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-04-02 18:08:11 +0000
commit8a7efa45c38ed3200d173d2c3207a8154e583c16 (patch)
tree1bb4d579b95c79aae4946a06fefa089e5549b722 /app/models/commit_status.rb
parent53b1f4eaa2a451aaba908a5fee7ce97a930021ac (diff)
downloadgitlab-ce-8a7efa45c38ed3200d173d2c3207a8154e583c16.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/commit_status.rb')
-rw-r--r--app/models/commit_status.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/commit_status.rb b/app/models/commit_status.rb
index 03260b28335..046f131b041 100644
--- a/app/models/commit_status.rb
+++ b/app/models/commit_status.rb
@@ -178,12 +178,12 @@ class CommitStatus < ApplicationRecord
select(:name)
end
- def self.status_for_prior_stages(index)
- before_stage(index).latest.slow_composite_status || 'success'
+ def self.status_for_prior_stages(index, project:)
+ before_stage(index).latest.slow_composite_status(project: project) || 'success'
end
- def self.status_for_names(names)
- where(name: names).latest.slow_composite_status || 'success'
+ def self.status_for_names(names, project:)
+ where(name: names).latest.slow_composite_status(project: project) || 'success'
end
def self.update_as_processed!