Merge branch 'docker-registry' into docker-registry-view

1 files changed, 3 insertions, 3 deletions

diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb
index 9bfc1085fb9..a0cda4adc56 100644
--- a/app/services/auth/container_registry_authentication_service.rb
+++ b/app/services/auth/container_registry_authentication_service.rb
@@ -7,10 +7,10 @@ module Auth
 
       if params[:offline_token]
         return error('forbidden', 403) unless current_user
+      else
+        return error('forbidden', 401) unless scope
       end
 
-      return error('forbidden', 401) unless scope
-
       { token: authorized_token(scope).encoded }
     end
 
@@ -32,7 +32,7 @@ module Auth
       token.issuer = registry.issuer
       token.audience = params[:service]
       token.subject = current_user.try(:username)
-      token[:access] = accesses
+      token[:access] = accesses.compact
       token
     end