Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
bf4884d0
Commit
bf4884d0
authored
Apr 14, 2021
by
David Fernandez
Committed by
Alex Kalderimis
Apr 14, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Optimize the package finder helper when dealing with deploy tokens [RUN ALL RSPEC] [RUN AS-IF-FOSS]
parent
d2be5844
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
167 additions
and
64 deletions
+167
-64
app/finders/concerns/packages/finder_helper.rb
app/finders/concerns/packages/finder_helper.rb
+9
-5
config/feature_flags/development/packages_finder_helper_deploy_token.yml
...flags/development/packages_finder_helper_deploy_token.yml
+8
-0
spec/finders/concerns/packages/finder_helper_spec.rb
spec/finders/concerns/packages/finder_helper_spec.rb
+150
-59
No files found.
app/finders/concerns/packages/finder_helper.rb
View file @
bf4884d0
...
...
@@ -13,7 +13,7 @@ module Packages
return
::
Packages
::
Package
.
none
unless
within_group
return
::
Packages
::
Package
.
none
unless
Ability
.
allowed?
(
user
,
:read_group
,
within_group
)
projects
=
projects_visible_to_reporters
(
user
,
within_group
.
self_and_descendants
.
select
(
:id
)
)
projects
=
projects_visible_to_reporters
(
user
,
within_group
:
within_group
)
::
Packages
::
Package
.
for_projects
(
projects
.
select
(
:id
))
end
...
...
@@ -21,12 +21,16 @@ module Packages
return
::
Project
.
none
unless
within_group
return
::
Project
.
none
unless
Ability
.
allowed?
(
user
,
:read_group
,
within_group
)
projects_visible_to_reporters
(
user
,
within_group
.
self_and_descendants
.
select
(
:id
)
)
projects_visible_to_reporters
(
user
,
within_group
:
within_group
)
end
def
projects_visible_to_reporters
(
user
,
namespace_ids
)
::
Project
.
in_namespace
(
namespace_ids
)
.
public_or_visible_to_user
(
user
,
::
Gitlab
::
Access
::
REPORTER
)
def
projects_visible_to_reporters
(
user
,
within_group
:)
if
user
.
is_a?
(
DeployToken
)
&&
Feature
.
enabled?
(
:packages_finder_helper_deploy_token
)
user
.
accessible_projects
else
within_group
.
all_projects
.
public_or_visible_to_user
(
user
,
::
Gitlab
::
Access
::
REPORTER
)
end
end
def
package_type
...
...
config/feature_flags/development/packages_finder_helper_deploy_token.yml
0 → 100644
View file @
bf4884d0
---
name
:
packages_finder_helper_deploy_token
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58497
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/326808
milestone
:
'
13.11'
type
:
development
group
:
group::package
default_enabled
:
false
spec/finders/concerns/packages/finder_helper_spec.rb
View file @
bf4884d0
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment