diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-30 21:09:49 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-30 21:09:49 +0000 |
| commit | 9877050db1dd1693c672a6b29a356c5b2a7edce0 (patch) | |
| tree | 07e8b3837333294337121b96f296eb5622a8a7e9 /app/views/shared/milestones | |
| parent | 370736438075748c36abd7fd7dd32a8ef98048f9 (diff) | |
| download | gitlab-ce-9877050db1dd1693c672a6b29a356c5b2a7edce0.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/shared/milestones')
| -rw-r--r-- | app/views/shared/milestones/_milestone.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/milestones/_sidebar.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/milestones/_milestone.html.haml b/app/views/shared/milestones/_milestone.html.haml index 3082c6bb4db..59d1537aa2b 100644 --- a/app/views/shared/milestones/_milestone.html.haml +++ b/app/views/shared/milestones/_milestone.html.haml @@ -14,7 +14,7 @@ - if milestone.due_date || milestone.start_date .text-tertiary.gl-mb-2 = milestone_date_range(milestone) - - recent_releases, total_count, more_count = recent_releases_with_counts(milestone) + - recent_releases, total_count, more_count = recent_releases_with_counts(milestone, current_user) - unless total_count == 0 .text-tertiary.gl-mb-2.milestone-release-links = sprite_icon("rocket", size: 12) diff --git a/app/views/shared/milestones/_sidebar.html.haml b/app/views/shared/milestones/_sidebar.html.haml index 12026b89429..6a65909b1c2 100644 --- a/app/views/shared/milestones/_sidebar.html.haml +++ b/app/views/shared/milestones/_sidebar.html.haml @@ -138,7 +138,7 @@ = milestone.merge_requests.merged.count - if project - - recent_releases, total_count, more_count = recent_releases_with_counts(milestone) + - recent_releases, total_count, more_count = recent_releases_with_counts(milestone, current_user) .block.releases .sidebar-collapsed-icon.has-tooltip{ title: milestone_releases_tooltip_text(milestone), data: { container: 'body', placement: 'left', boundary: 'viewport' } } %strong |