diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-12 13:03:04 -0500 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-05-12 13:03:04 -0500 |
| commit | 5c2f2fd2890b7efd7a63f9a371b2f795f2e9fa43 (patch) | |
| tree | 473a1f9f2fc6c9d33a968218338815e2d84479af /app/views/projects/container_registry | |
| parent | 4d84ba43d8db6a205e79dd8cf723be7ceebf6925 (diff) | |
| download | gitlab-ce-5c2f2fd2890b7efd7a63f9a371b2f795f2e9fa43.tar.gz | |
Fix CI tests
Diffstat (limited to 'app/views/projects/container_registry')
| -rw-r--r-- | app/views/projects/container_registry/_tag.html.haml | 9 | ||||
| -rw-r--r-- | app/views/projects/container_registry/index.html.haml | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/app/views/projects/container_registry/_tag.html.haml b/app/views/projects/container_registry/_tag.html.haml index f97988d20cf..bf816d109b6 100644 --- a/app/views/projects/container_registry/_tag.html.haml +++ b/app/views/projects/container_registry/_tag.html.haml @@ -14,7 +14,8 @@ = pluralize(tag.layers.size, "layer") %td = time_ago_in_words(tag.created_at) - %td.content - .controls.hidden-xs.pull-right - = link_to namespace_project_container_registry_path(@project.namespace, @project, tag.name), class: 'btn btn-remove has-tooltip', title: "Remove", data: { confirm: "Are you sure?" }, method: :delete do - = icon("trash cred") + - if can?(current_user, :update_container_registry, @project) + %td.content + .controls.hidden-xs.pull-right + = link_to namespace_project_container_registry_path(@project.namespace, @project, tag.name), class: 'btn btn-remove has-tooltip', title: "Remove", data: { confirm: "Are you sure?" }, method: :delete do + = icon("trash cred") diff --git a/app/views/projects/container_registry/index.html.haml b/app/views/projects/container_registry/index.html.haml index 701f1a86b56..ea7c4faaaec 100644 --- a/app/views/projects/container_registry/index.html.haml +++ b/app/views/projects/container_registry/index.html.haml @@ -18,7 +18,7 @@ %code docker login #{Gitlab.config.registry.host_port} %br - Then you are free to create and upload a container images with build and push commands: + Then you are free to create and upload a container image with build and push commands: %pre docker build -t #{escape_once(@project.container_registry_repository_url)} . %br @@ -33,7 +33,8 @@ %th Image ID %th Size %th Created - %th + - if can?(current_user, :update_container_registry, @project) + %th - @tags.each do |tag| = render 'tag', tag: tag
\ No newline at end of file |