Merge branch 'kt/bug/fix-revision-and-size-for-container-registry' into 'master'
Add short_revision and use total_size Closes #39203 See merge request gitlab-org/gitlab-ce!14917
This commit is contained in:
commit
0fa2f14857
|
@ -38,7 +38,7 @@ export default {
|
|||
tag: element.name,
|
||||
revision: element.revision,
|
||||
shortRevision: element.short_revision,
|
||||
size: element.size,
|
||||
size: element.total_size,
|
||||
layers: element.layers,
|
||||
location: element.location,
|
||||
createdAt: element.created_at,
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
class ContainerTagEntity < Grape::Entity
|
||||
include RequestAwareEntity
|
||||
|
||||
expose :name, :location, :revision, :total_size, :created_at
|
||||
expose :name, :location, :revision, :short_revision, :total_size, :created_at
|
||||
|
||||
expose :destroy_path, if: -> (*) { can_destroy? } do |tag|
|
||||
project_registry_repository_tag_path(project, tag.repository, tag.name, format: :json)
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Fix revision and total size missing for Container Registry
|
||||
merge_request:
|
||||
author:
|
||||
type: fixed
|
|
@ -14,6 +14,11 @@
|
|||
"revision": {
|
||||
"type": "string"
|
||||
},
|
||||
"short_revision": {
|
||||
"type": "string",
|
||||
"minLength": 9,
|
||||
"maxLength": 9
|
||||
},
|
||||
"total_size": {
|
||||
"type": "integer"
|
||||
},
|
||||
|
|
|
@ -26,7 +26,7 @@ export const registryServerResponse = [
|
|||
name: 'centos7',
|
||||
short_revision: 'b118ab5b0',
|
||||
revision: 'b118ab5b0e90b7cb5127db31d5321ac14961d097516a8e0e72084b6cdc783b43',
|
||||
size: 679,
|
||||
total_size: 679,
|
||||
layers: 19,
|
||||
location: 'location',
|
||||
created_at: 1505828744434,
|
||||
|
@ -36,7 +36,7 @@ export const registryServerResponse = [
|
|||
name: 'centos6',
|
||||
short_revision: 'b118ab5b0',
|
||||
revision: 'b118ab5b0e90b7cb5127db31d5321ac14961d097516a8e0e72084b6cdc783b43',
|
||||
size: 679,
|
||||
total_size: 679,
|
||||
layers: 19,
|
||||
location: 'location',
|
||||
created_at: 1505828744434,
|
||||
|
@ -70,7 +70,7 @@ export const parsedRegistryServerResponse = [
|
|||
tag: registryServerResponse[0].name,
|
||||
revision: registryServerResponse[0].revision,
|
||||
shortRevision: registryServerResponse[0].short_revision,
|
||||
size: registryServerResponse[0].size,
|
||||
size: registryServerResponse[0].total_size,
|
||||
layers: registryServerResponse[0].layers,
|
||||
location: registryServerResponse[0].location,
|
||||
createdAt: registryServerResponse[0].created_at,
|
||||
|
@ -81,7 +81,7 @@ export const parsedRegistryServerResponse = [
|
|||
tag: registryServerResponse[1].name,
|
||||
revision: registryServerResponse[1].revision,
|
||||
shortRevision: registryServerResponse[1].short_revision,
|
||||
size: registryServerResponse[1].size,
|
||||
size: registryServerResponse[1].total_size,
|
||||
layers: registryServerResponse[1].layers,
|
||||
location: registryServerResponse[1].location,
|
||||
createdAt: registryServerResponse[1].created_at,
|
||||
|
|
|
@ -22,7 +22,7 @@ describe ContainerTagEntity do
|
|||
end
|
||||
|
||||
it 'exposes required informations' do
|
||||
expect(subject).to include(:name, :location, :revision, :total_size, :created_at)
|
||||
expect(subject).to include(:name, :location, :revision, :short_revision, :total_size, :created_at)
|
||||
end
|
||||
|
||||
context 'when user can manage repositories' do
|
||||
|
|
Loading…
Reference in New Issue