Remove registry image delete button if user cant delete it

2017-06-20 21:12:46 +03:00 · 2017-06-20 21:12:46 +03:00 · 1d85cc462b
parent b2e1d32e7a
commit 1d85cc462b
2 changed files with 12 additions and 7 deletions
--- a/app/views/projects/registry/repositories/_image.html.haml
+++ b/app/views/projects/registry/repositories/_image.html.haml
@ -6,6 +6,7 @@

    = clipboard_button(clipboard_text: "docker pull #{image.location}")

+    - if can?(current_user, :update_container_image, @project)
      .controls.hidden-xs.pull-right
        = link_to namespace_project_container_registry_path(@project.namespace, @project, image),
                  class: 'btn btn-remove has-tooltip',
--- a/changelogs/unreleased/33837-remove-trash-on-registry-image.yml
+++ b/changelogs/unreleased/33837-remove-trash-on-registry-image.yml
@ -0,0 +1,4 @@
+---
+title: Remove registry image delete button if user cant delete it
+merge_request: 12317
+author: Ivan Chernov