Commit dca5cbbb authored by Alex Kalderimis's avatar Alex Kalderimis

Merge branch 'fix-dependency-proxy-revisions' into 'master'

Revert Dependency Proxy permission

See merge request gitlab-org/gitlab!67696
parents 5d676eb1 7dc1c46c
......@@ -52,7 +52,7 @@ class GroupPolicy < BasePolicy
condition(:dependency_proxy_access_allowed) do
if Feature.enabled?(:dependency_proxy_for_private_groups, default_enabled: true)
access_level >= GroupMember::REPORTER || valid_dependency_proxy_deploy_token
access_level >= GroupMember::GUEST || valid_dependency_proxy_deploy_token
else
can?(:read_group)
end
......
......@@ -301,7 +301,7 @@ The following table lists group permissions available for each role:
| Create/edit/delete iterations | | | ✓ | ✓ | ✓ |
| Create/edit/delete metrics dashboard annotations | | | ✓ | ✓ | ✓ |
| Enable/disable a dependency proxy | | | ✓ | ✓ | ✓ |
| Pull a container image using the dependency proxy | | ✓ | ✓ | ✓ | ✓ |
| Pull a container image using the dependency proxy | | ✓ | ✓ | ✓ | ✓ |
| Purge the dependency proxy for a group | | | | | ✓ |
| Publish [packages](packages/index.md) | | | ✓ | ✓ | ✓ |
| Use security dashboard **(ULTIMATE)** | | | ✓ | ✓ | ✓ |
......
......@@ -185,7 +185,7 @@ RSpec.describe Groups::DependencyProxyForContainersController do
end
before do
group.add_reporter(user)
group.add_guest(user)
end
it 'proxies status from the remote token request', :aggregate_failures do
......@@ -206,7 +206,7 @@ RSpec.describe Groups::DependencyProxyForContainersController do
end
before do
group.add_reporter(user)
group.add_guest(user)
end
it 'proxies status from the remote manifest request', :aggregate_failures do
......@@ -219,7 +219,7 @@ RSpec.describe Groups::DependencyProxyForContainersController do
context 'a valid user' do
before do
group.add_reporter(user)
group.add_guest(user)
end
it_behaves_like 'a successful manifest pull'
......@@ -308,7 +308,7 @@ RSpec.describe Groups::DependencyProxyForContainersController do
end
before do
group.add_reporter(user)
group.add_guest(user)
end
it 'proxies status from the remote blob request', :aggregate_failures do
......@@ -321,7 +321,7 @@ RSpec.describe Groups::DependencyProxyForContainersController do
context 'a valid user' do
before do
group.add_reporter(user)
group.add_guest(user)
end
it_behaves_like 'a successful blob pull'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment