diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-17 17:06:55 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-17 17:06:55 +0000 |
| commit | 1ca1ebc09bda279dcbacfcfaf39e0410f94ca985 (patch) | |
| tree | f14bec426deba16ff32635da5121e636194e923d /spec | |
| parent | fcd9f90641d5ee59cc84d8388b7cc372370ac25a (diff) | |
| parent | 35319aa4ac0d33b5722bbced38767735d045971d (diff) | |
| download | gitlab-ce-1ca1ebc09bda279dcbacfcfaf39e0410f94ca985.tar.gz | |
Merge branch 'registry-500-fix' into 'master'
Properly support application/json in Container Registry
## What does this MR do?
When requesting tags a `application/json` is used by `docker/distribution`.
## Why was this MR needed?
Fixes regression introduced by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4669
## What are the relevant issue numbers?
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18736
See merge request !4742
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/lib/container_registry/repository_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/lib/container_registry/repository_spec.rb b/spec/lib/container_registry/repository_spec.rb index 279709521c9..c364e759108 100644 --- a/spec/lib/container_registry/repository_spec.rb +++ b/spec/lib/container_registry/repository_spec.rb @@ -21,7 +21,7 @@ describe ContainerRegistry::Repository do to_return( status: 200, body: JSON.dump(tags: ['test']), - headers: { 'Content-Type' => 'application/vnd.docker.distribution.manifest.v2+json' }) + headers: { 'Content-Type' => 'application/json' }) end context '#manifest' do |