summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-06-15 16:08:45 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2016-07-15 17:14:00 +0200
commitfbdf9008c2f6f2fbf75338ab6582b65072972f08 (patch)
tree72f7680152601c65845cc2b5d5787f39488c6997
parent8b7932c21951de172d531ab8a3e9506c98db7483 (diff)
downloadgitlab-ce-fbdf9008c2f6f2fbf75338ab6582b65072972f08.tar.gz
Make docker registry work with location redirects when external storage is used
-rw-r--r--CHANGELOG1
-rw-r--r--lib/container_registry/tag.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 5ab16db31ce..8a4b8f4dfbc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -281,6 +281,7 @@ v 8.9.0
- TeamCity Service: Fix URL handling when base URL contains a path
- Todos will display target state if issuable target is 'Closed' or 'Merged'
- Validate only and except regexp
+ - Make docker registry work with location redirects when external storage is used
- Fix bug when sorting issues by milestone due date and filtering by two or more labels
- POST to API /projects/:id/runners/:runner_id would give 409 if the runner was already enabled for this project
- Add support for using Yubikeys (U2F) for two-factor authentication
diff --git a/lib/container_registry/tag.rb b/lib/container_registry/tag.rb
index 708d01b95a1..59040199920 100644
--- a/lib/container_registry/tag.rb
+++ b/lib/container_registry/tag.rb
@@ -53,7 +53,7 @@ module ContainerRegistry
def config
return unless config_blob
- @config ||= ContainerRegistry::Config.new(self, config_blob)
+ @config ||= ContainerRegistry::Config.new(self, config_blob) if config_blob.data
end
def created_at