summaryrefslogtreecommitdiff
path: root/app/presenters/commit_presenter.rb
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2022-08-30 15:09:23 +0000
committerGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2022-08-30 15:09:23 +0000
commit33d3043f0f3b825f98c7ff2c794208a79bcafdb3 (patch)
tree2fc8f97f12f9e3049ed3daad5700ae438b7eac9b /app/presenters/commit_presenter.rb
parent99e4792893862d913d0bc9168da7d85775445590 (diff)
parentf1452cd5cf4c3e2dd6697bc25636b49c1aadecd1 (diff)
downloadgitlab-ce-15-1-stable.tar.gz
Merge remote-tracking branch 'dev/15-1-stable' into 15-1-stable15-1-stable
Diffstat (limited to 'app/presenters/commit_presenter.rb')
-rw-r--r--app/presenters/commit_presenter.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/app/presenters/commit_presenter.rb b/app/presenters/commit_presenter.rb
index 7df45ca03bb..2cb88179845 100644
--- a/app/presenters/commit_presenter.rb
+++ b/app/presenters/commit_presenter.rb
@@ -5,12 +5,20 @@ class CommitPresenter < Gitlab::View::Presenter::Delegated
presents ::Commit, as: :commit
- def status_for(ref)
+ def detailed_status_for(ref)
+ return unless can?(current_user, :read_pipeline, commit.latest_pipeline(ref))
return unless can?(current_user, :read_commit_status, commit.project)
commit.latest_pipeline(ref)&.detailed_status(current_user)
end
+ def status_for(ref = nil)
+ return unless can?(current_user, :read_pipeline, commit.latest_pipeline(ref))
+ return unless can?(current_user, :read_commit_status, commit.project)
+
+ commit.status(ref)
+ end
+
def any_pipelines?
return false unless can?(current_user, :read_pipeline, commit.project)