diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-05-21 22:57:39 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-05-21 22:57:39 +0000 |
| commit | 5a02f28a1bb890fd62df628bfe610c0b4d49b2f1 (patch) | |
| tree | 489fd77b26362c22c0b2300a7777bf36c25494a9 /app | |
| parent | 024ddf6ea4088bbf5044e5d1b3326769e62073f4 (diff) | |
| parent | c6411a785b0c49d17b831a9b4bc05ef4bb68b87f (diff) | |
| download | gitlab-ce-5a02f28a1bb890fd62df628bfe610c0b4d49b2f1.tar.gz | |
Merge branch 'fix-docker-registry-integration' into 'master'
Fix docker registry integration
See merge request !4229
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/auth/container_registry_authentication_service.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/container_registry/index.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/services/auth/container_registry_authentication_service.rb b/app/services/auth/container_registry_authentication_service.rb index 3144e96ba31..f807b8ec09a 100644 --- a/app/services/auth/container_registry_authentication_service.rb +++ b/app/services/auth/container_registry_authentication_service.rb @@ -20,7 +20,7 @@ module Auth token.issuer = registry.issuer token.audience = AUDIENCE token[:access] = names.map do |name| - { type: 'repository', name: name, actions: %w(pull push) } + { type: 'repository', name: name, actions: %w(*) } end token.encoded end diff --git a/app/views/projects/container_registry/index.html.haml b/app/views/projects/container_registry/index.html.haml index 40957993b22..e1e762410f2 100644 --- a/app/views/projects/container_registry/index.html.haml +++ b/app/views/projects/container_registry/index.html.haml @@ -4,7 +4,7 @@ %hr %ul.content-list - .light.prepend-top-default + %li.light.prepend-top-default %p A 'container image' is a snapshot of a container. You can host your container images with GitLab. |