diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-21 13:08:22 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-21 13:08:22 +0000 |
| commit | cf3cdd48bb4959cb277752a16a4b98b7f4a4f3c4 (patch) | |
| tree | 98100b28aa82f0a73455f7837572dc8c27222939 | |
| parent | f96562b107b876d7814bef2ed2acc6b5d06638e2 (diff) | |
| parent | 1d85cc462b69976962918bc16d06671b77706960 (diff) | |
| download | gitlab-ce-cf3cdd48bb4959cb277752a16a4b98b7f4a4f3c4.tar.gz | |
Merge branch '33837-remove-trash-on-registry-image' into 'master'
Remove registry image delete button if user cant delete it
Closes #33837
See merge request !12317
| -rw-r--r-- | app/views/projects/registry/repositories/_image.html.haml | 15 | ||||
| -rw-r--r-- | changelogs/unreleased/33837-remove-trash-on-registry-image.yml | 4 |
2 files changed, 12 insertions, 7 deletions
diff --git a/app/views/projects/registry/repositories/_image.html.haml b/app/views/projects/registry/repositories/_image.html.haml index 8bc78f8d018..dcdc432b654 100644 --- a/app/views/projects/registry/repositories/_image.html.haml +++ b/app/views/projects/registry/repositories/_image.html.haml @@ -6,13 +6,14 @@ = clipboard_button(clipboard_text: "docker pull #{image.location}") - .controls.hidden-xs.pull-right - = link_to namespace_project_container_registry_path(@project.namespace, @project, image), - class: 'btn btn-remove has-tooltip', - title: 'Remove repository', - data: { confirm: 'Are you sure?' }, - method: :delete do - = icon('trash cred', 'aria-hidden': 'true') + - 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', + title: 'Remove repository', + data: { confirm: 'Are you sure?' }, + method: :delete do + = icon('trash cred', 'aria-hidden': 'true') .container-image-tags.js-toggle-content.hide - if image.has_tags? diff --git a/changelogs/unreleased/33837-remove-trash-on-registry-image.yml b/changelogs/unreleased/33837-remove-trash-on-registry-image.yml new file mode 100644 index 00000000000..2d337f5e6e4 --- /dev/null +++ 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 |