diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-04 09:10:10 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-04 09:10:10 +0300 |
| commit | 2fa68d3a97fd31bf469050e130f0fc95e8944316 (patch) | |
| tree | 5c00585c55c44917765c152426cb58c803b4f57f /app/views/projects/issues | |
| parent | 21be9646a94e2c145897e25d9c521523d55e1614 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/issues')
| -rw-r--r-- | app/views/projects/issues/_related_branches.html.haml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/views/projects/issues/_related_branches.html.haml b/app/views/projects/issues/_related_branches.html.haml index 69b030ed76a..0604e89be6e 100644 --- a/app/views/projects/issues/_related_branches.html.haml +++ b/app/views/projects/issues/_related_branches.html.haml @@ -4,11 +4,9 @@ %ul.unstyled-list.related-merge-requests - @related_branches.each do |branch| %li - - target = @project.repository.find_branch(branch).dereferenced_target - - pipeline = @project.pipeline_for(branch, target.sha) if target - - if can?(current_user, :read_pipeline, pipeline) + - if branch[:pipeline_status].present? %span.related-branch-ci-status - = render 'ci/status/icon', status: pipeline.detailed_status(current_user) + = render 'ci/status/icon', status: branch[:pipeline_status] %span.related-branch-info %strong - = link_to branch, project_compare_path(@project, from: @project.default_branch, to: branch), class: "ref-name" + = link_to branch[:name], branch[:link], class: "ref-name" |