diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-20 16:18:24 +0300 |
| commit | 0653e08efd039a5905f3fa4f6e9cef9f5d2f799c (patch) | |
| tree | 4dcc884cf6d81db44adae4aa99f8ec1233a41f55 /app/views/projects/ci/builds/_build.html.haml | |
| parent | 744144d28e3e7fddc117924fef88de5d9674fe4c (diff) | |
Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42
Diffstat (limited to 'app/views/projects/ci/builds/_build.html.haml')
| -rw-r--r-- | app/views/projects/ci/builds/_build.html.haml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index 1a3813ba99f..437529c3608 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -7,10 +7,14 @@ - pipeline_link = local_assigns.fetch(:pipeline_link, false) - stage = local_assigns.fetch(:stage, false) - allow_retry = local_assigns.fetch(:allow_retry, false) +-# This prevents initializing another Ci::Status object where 'status' is used +- status = job.detailed_status(current_user) %tr.build.commit{ class: ('retried' if retried) } %td.status - = render "ci/status/badge", status: job.detailed_status(current_user), title: job.status_title + -# Sending 'status' prevents calling the user relation inside the presenter, generating N+1, + -# see https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68743 + = render "ci/status/badge", status: status, title: job.status_title(status) %td - if can?(current_user, :read_build, job) |