diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-14 14:28:08 -0500 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-14 14:28:08 -0500 |
commit | 5c19476286eb63325cbae7b1a21966e55712f367 (patch) | |
tree | 6a321c7700603c6c8a0512df330141d8a7417659 | |
parent | 9eeea4245b3c97505ec5f877b282a80dcd2da5fb (diff) | |
parent | 715a8cfa2f4639bf36b604f6e3eb2814187367c0 (diff) | |
download | gitlab-ce-5c19476286eb63325cbae7b1a21966e55712f367.tar.gz |
Merge branch 'docker-registry' into docker-registry-view
-rw-r--r-- | app/services/auth/container_registry_authentication_service.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb index fcd02c02868..45b163d213e 100644 --- a/app/services/auth/container_registry_authentication_service.rb +++ b/app/services/auth/container_registry_authentication_service.rb @@ -67,6 +67,8 @@ module Auth end def can_access?(requested_project, requested_action) + return false unless requested_project.container_registry_enabled? + case requested_action when 'pull' requested_project == project || can?(current_user, :read_container_registry, requested_project) |