diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-03-19 13:26:17 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2019-03-19 13:26:17 +0000 |
| commit | a0289b5ce5440be8181eba6d988cd4bc86b31cd9 (patch) | |
| tree | 20e725d76947123a77d570b6c5c3b1a01d4ab917 /app/services | |
| parent | b0169d0378027a4f4e0cc340f653e23c8faaa2fb (diff) | |
| parent | eadee27a3f9753d446a7e29c1a24eb773443f1d7 (diff) | |
| download | gitlab-ce-a0289b5ce5440be8181eba6d988cd4bc86b31cd9.tar.gz | |
Merge branch 'fix/registry2.7-delete-auth' into 'master'
Add support for deleting images in registry 2.7
See merge request gitlab-org/gitlab-ce!25862
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/auth/container_registry_authentication_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb index e95ba09c006..707caee482c 100644 --- a/app/services/auth/container_registry_authentication_service.rb +++ b/app/services/auth/container_registry_authentication_service.rb @@ -116,7 +116,7 @@ module Auth build_can_pull?(requested_project) || user_can_pull?(requested_project) || deploy_token_can_pull?(requested_project) when 'push' build_can_push?(requested_project) || user_can_push?(requested_project) - when '*' + when '*', 'delete' user_can_admin?(requested_project) else false |