diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-15 15:07:39 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-15 15:07:39 +0000 |
| commit | a8b46301907abeeedab4010a966bbd8efc8d370c (patch) | |
| tree | a24d4121c2912b55e9b38689859afd971ac81463 /app/views | |
| parent | e27de52607369a11ee3cec7fbdd2ffa5cb6e0061 (diff) | |
| parent | 3213023dd657ba6c5c6d690fae2ca44a409b16fd (diff) | |
| download | gitlab-ce-a8b46301907abeeedab4010a966bbd8efc8d370c.tar.gz | |
Merge branch 'docker-registry-manifest-v1' into 'master'
Add support for Docker Registry manifest v1
## What does this MR do?
Adds support for Manifest V1 generated by older versions of Docker (before 1.10).
## What are the relevant issue numbers?
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18609
See merge request !4669
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/container_registry/_tag.html.haml | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/app/views/projects/container_registry/_tag.html.haml b/app/views/projects/container_registry/_tag.html.haml index 4e9f936539b..f35faa6afb5 100644 --- a/app/views/projects/container_registry/_tag.html.haml +++ b/app/views/projects/container_registry/_tag.html.haml @@ -9,11 +9,19 @@ - else \- %td - = number_to_human_size(tag.total_size) - · - = pluralize(tag.layers.size, "layer") + - if tag.total_size + = number_to_human_size(tag.total_size) + · + = pluralize(tag.layers.size, "layer") + - else + .light + \- %td - = time_ago_in_words(tag.created_at) + - if tag.created_at + = time_ago_in_words(tag.created_at) + - else + .light + \- - if can?(current_user, :update_container_image, @project) %td.content .controls.hidden-xs.pull-right |