diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-29 14:13:05 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-29 14:13:29 +0000 |
| commit | bb51b8a098aa17b226d1e7941218512f8c835e08 (patch) | |
| tree | f8765bb77a206b8213b3a777252ce8e2e21642e0 /app | |
| parent | 5c4639afa1f53d7ed6f682168fda0b491c16e844 (diff) | |
| download | gitlab-ce-bb51b8a098aa17b226d1e7941218512f8c835e08.tar.gz | |
Add latest changes from gitlab-org/security/gitlab@15-1-stable-ee
Diffstat (limited to 'app')
| -rw-r--r-- | app/finders/packages/conan/package_finder.rb | 2 | ||||
| -rw-r--r-- | app/helpers/timeboxes_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/shared/milestones/_milestone.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/milestones/_sidebar.html.haml | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/app/finders/packages/conan/package_finder.rb b/app/finders/packages/conan/package_finder.rb index 8ebdd358ba6..210b37635b3 100644 --- a/app/finders/packages/conan/package_finder.rb +++ b/app/finders/packages/conan/package_finder.rb @@ -25,7 +25,7 @@ module Packages end def projects_visible_to_current_user - ::Project.public_or_visible_to_user(current_user) + ::Project.public_or_visible_to_user(current_user, ::Gitlab::Access::REPORTER) end end end diff --git a/app/helpers/timeboxes_helper.rb b/app/helpers/timeboxes_helper.rb index c81fbcbfd11..39993bbfb44 100644 --- a/app/helpers/timeboxes_helper.rb +++ b/app/helpers/timeboxes_helper.rb @@ -153,11 +153,11 @@ module TimeboxesHelper n_("%{releases} release", "%{releases} releases", count) % { releases: count } end - def recent_releases_with_counts(milestone) + def recent_releases_with_counts(milestone, user) total_count = milestone.releases.size return [[], 0, 0] if total_count == 0 - recent_releases = milestone.releases.recent.to_a + recent_releases = milestone.releases.recent.filter { |release| Ability.allowed?(user, :read_release, release) } more_count = total_count - recent_releases.size [recent_releases, total_count, more_count] end 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 |