summaryrefslogtreecommitdiff
path: root/app/serializers
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2017-10-18 09:02:32 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2017-10-18 09:02:32 +0000
commit0fa2f14857ceb5b5b52595555bb2c3e6e930e1f7 (patch)
tree71d09c4aeb45cf238739b84f2931ca5f58739ad4 /app/serializers
parent1090514ab407b7faa894cbd9b6cd769c376a9b5d (diff)
parent6ac0a69b688608bc971b8b69494ac5ef8aac72c0 (diff)
downloadgitlab-ce-0fa2f14857ceb5b5b52595555bb2c3e6e930e1f7.tar.gz
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
Diffstat (limited to 'app/serializers')
-rw-r--r--app/serializers/container_tag_entity.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/container_tag_entity.rb b/app/serializers/container_tag_entity.rb
index ec1fc349586..26a68c43807 100644
--- a/app/serializers/container_tag_entity.rb
+++ b/app/serializers/container_tag_entity.rb
@@ -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)