summaryrefslogtreecommitdiff
path: root/app/helpers/timeboxes_helper.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-06-29 14:13:29 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-06-29 14:13:55 +0000
commit9fdc4213b6a4bb8f45d6e65f90047ac742e1c48b (patch)
tree015c539e5b143976dd238e832703da09b92268dd /app/helpers/timeboxes_helper.rb
parent9ca24e5c1f715a597e694961ac0d60674166039a (diff)
downloadgitlab-ce-9fdc4213b6a4bb8f45d6e65f90047ac742e1c48b.tar.gz
Add latest changes from gitlab-org/security/gitlab@14-10-stable-ee
Diffstat (limited to 'app/helpers/timeboxes_helper.rb')
-rw-r--r--app/helpers/timeboxes_helper.rb4
1 files changed, 2 insertions, 2 deletions
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